View | Details | Raw Unified | Return to bug 25109
Collapse All | Expand All

(-)a/Makefile.PL (+9 lines)
Lines 264-269 contain information of interest to Koha developers. Link Here
264
Directory for Koha documentation accessed from the
264
Directory for Koha documentation accessed from the
265
command-line, e.g., READMEs.
265
command-line, e.g., READMEs.
266
266
267
=item LOCK_DIR
268
269
Directory for Koha scripts to put their locks.
270
267
=item LOG_DIR
271
=item LOG_DIR
268
272
269
Directory for Apache and Zebra logs produced by Koha.
273
Directory for Apache and Zebra logs produced by Koha.
Lines 359-364 my $target_map = { Link Here
359
  './serials'                   => 'INTRANET_CGI_DIR',
363
  './serials'                   => 'INTRANET_CGI_DIR',
360
  './services'                  => 'INTRANET_CGI_DIR',
364
  './services'                  => 'INTRANET_CGI_DIR',
361
  './skel'                      => 'NONE',
365
  './skel'                      => 'NONE',
366
  './skel/var/lock/koha'        => { target => 'LOCK_DIR', trimdir => -1 },
362
  './skel/var/log/koha'         => { target => 'LOG_DIR', trimdir => -1 },
367
  './skel/var/log/koha'         => { target => 'LOG_DIR', trimdir => -1 },
363
  './skel/var/spool/koha'       => { target => 'BACKUP_DIR', trimdir => -1 },
368
  './skel/var/spool/koha'       => { target => 'BACKUP_DIR', trimdir => -1 },
364
  './skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 },
369
  './skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 },
Lines 664-669 my %test_suite_override_dirs = ( Link Here
664
    KOHA_CONF_DIR  => ['etc'],
669
    KOHA_CONF_DIR  => ['etc'],
665
    ZEBRA_CONF_DIR => ['etc', 'zebradb'],
670
    ZEBRA_CONF_DIR => ['etc', 'zebradb'],
666
    Z3950_CONF_DIR => ['etc', 'z3950'],
671
    Z3950_CONF_DIR => ['etc', 'z3950'],
672
    LOCK_DIR       => ['var', 'lock'],
667
    LOG_DIR        => ['var', 'log'],
673
    LOG_DIR        => ['var', 'log'],
668
    BACKUP_DIR     => ['var', 'spool'],
674
    BACKUP_DIR     => ['var', 'spool'],
669
    SCRIPT_DIR     => ['bin'],
675
    SCRIPT_DIR     => ['bin'],
Lines 1393-1398 sub get_target_directories { Link Here
1393
        $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
1399
        $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
1394
        $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
1400
        $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
1395
        $dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb');
1401
        $dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb');
1402
        $dirmap{'LOCK_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lock');
1396
        $dirmap{'LOG_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'log');
1403
        $dirmap{'LOG_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'log');
1397
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'spool');
1404
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'spool');
1398
        $dirmap{'PLUGINS_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'koha', 'plugins');
1405
        $dirmap{'PLUGINS_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'koha', 'plugins');
Lines 1429-1434 sub get_target_directories { Link Here
1429
        $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
1436
        $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
1430
        $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
1437
        $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
1431
        $dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb');
1438
        $dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb');
1439
        $dirmap{'LOCK_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lock');
1432
        $dirmap{'LOG_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'log');
1440
        $dirmap{'LOG_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'log');
1433
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'spool');
1441
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'spool');
1434
        $dirmap{'PLUGINS_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'plugins');
1442
        $dirmap{'PLUGINS_DIR'} =  File::Spec->catdir(@basedir, $package, 'var', 'lib', 'plugins');
Lines 1454-1459 sub get_target_directories { Link Here
1454
        $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
1462
        $dirmap{'MAN_DIR'} = File::Spec->catdir(@basedir, $package, 'man');
1455
        $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
1463
        $dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc');
1456
        $dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lock', $package, 'zebradb');
1464
        $dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lock', $package, 'zebradb');
1465
        $dirmap{'LOCK_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'lock', $package);
1457
        $dirmap{'LOG_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'log', $package);
1466
        $dirmap{'LOG_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'log', $package);
1458
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'spool', $package);
1467
        $dirmap{'BACKUP_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'spool', $package);
1459
        $dirmap{'PLUGINS_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'plugins');
1468
        $dirmap{'PLUGINS_DIR'} =  File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'plugins');
(-)a/debian/templates/koha-conf-site.xml.in (+1 lines)
Lines 302-307 __END_SRU_PUBLICSERVER__ Link Here
302
 <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
302
 <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
303
 <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
303
 <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
304
 <zebra_lockdir>/var/lock/koha/__KOHASITE__</zebra_lockdir>
304
 <zebra_lockdir>/var/lock/koha/__KOHASITE__</zebra_lockdir>
305
 <lockdir>/var/lock/koha/__KOHASITE__</lockdir>
305
 <use_zebra_facets>1</use_zebra_facets>
306
 <use_zebra_facets>1</use_zebra_facets>
306
 <zebra_max_record_size>1024</zebra_max_record_size>
307
 <zebra_max_record_size>1024</zebra_max_record_size>
307
 <log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
308
 <log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
(-)a/etc/koha-conf.xml (-1 / +1 lines)
Lines 119-124 __PAZPAR2_TOGGLE_XML_POST__ Link Here
119
 <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
119
 <useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
120
 <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
120
 <useshibboleth>0</useshibboleth><!-- see C4::Auth_with_shibboleth for extra configs you must do to turn this on -->
121
 <zebra_lockdir>__ZEBRA_LOCK_DIR__</zebra_lockdir>
121
 <zebra_lockdir>__ZEBRA_LOCK_DIR__</zebra_lockdir>
122
 <lockdir>__ZEBRA_LOCK_DIR__</lockdir>
122
 <use_zebra_facets>1</use_zebra_facets>
123
 <use_zebra_facets>1</use_zebra_facets>
123
 <zebra_max_record_size>1024</zebra_max_record_size>
124
 <zebra_max_record_size>1024</zebra_max_record_size>
124
 <log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
125
 <log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
125
- 

Return to bug 25109