Lines 230-235
Directory for Apache and Zebra logs produced by Koha.
Link Here
|
230 |
|
230 |
|
231 |
Directory for backup files produced by Koha. |
231 |
Directory for backup files produced by Koha. |
232 |
|
232 |
|
|
|
233 |
=item PLUGINS_DIR |
234 |
|
235 |
Directory for external Koha plugins. |
236 |
|
233 |
=item PAZPAR2_CONF_DIR |
237 |
=item PAZPAR2_CONF_DIR |
234 |
|
238 |
|
235 |
Directory for PazPar2 configuration files. |
239 |
Directory for PazPar2 configuration files. |
Lines 309-314
my $target_map = {
Link Here
|
309 |
'./skel/var/lib/koha/zebradb/biblios/register' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
313 |
'./skel/var/lib/koha/zebradb/biblios/register' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
310 |
'./skel/var/lib/koha/zebradb/biblios/shadow' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
314 |
'./skel/var/lib/koha/zebradb/biblios/shadow' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
311 |
'./skel/var/lib/koha/zebradb/biblios/tmp' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
315 |
'./skel/var/lib/koha/zebradb/biblios/tmp' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
|
|
316 |
'./skel/var/lib/koha/plugins' => { target => 'PLUGINS_DIR', trimdir => 6 }, |
312 |
'./sms' => 'INTRANET_CGI_DIR', |
317 |
'./sms' => 'INTRANET_CGI_DIR', |
313 |
'./suggestion' => 'INTRANET_CGI_DIR', |
318 |
'./suggestion' => 'INTRANET_CGI_DIR', |
314 |
'./svc' => 'INTRANET_CGI_DIR', |
319 |
'./svc' => 'INTRANET_CGI_DIR', |
Lines 1234-1239
sub get_target_directories {
Link Here
|
1234 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb'); |
1239 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb'); |
1235 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'log'); |
1240 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'log'); |
1236 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
1241 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
|
|
1242 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'koha', 'plugins'); |
1237 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1243 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1238 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1244 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1239 |
} elsif ($mode eq 'dev') { |
1245 |
} elsif ($mode eq 'dev') { |
Lines 1264-1269
sub get_target_directories {
Link Here
|
1264 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb'); |
1270 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb'); |
1265 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'log'); |
1271 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'log'); |
1266 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
1272 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
|
|
1273 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'plugins'); |
1267 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1274 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1268 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1275 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1269 |
} else { |
1276 |
} else { |
Lines 1286-1291
sub get_target_directories {
Link Here
|
1286 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lock', $package, 'zebradb'); |
1293 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lock', $package, 'zebradb'); |
1287 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'log', $package); |
1294 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'log', $package); |
1288 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'spool', $package); |
1295 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'spool', $package); |
|
|
1296 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'plugins'); |
1289 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb'); |
1297 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb'); |
1290 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb'); |
1298 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb'); |
1291 |
} |
1299 |
} |
Lines 1557-1563
make_upgrade_backup ::
Link Here
|
1557 |
\t\$(NOECHO) umask 022; \$(MOD_BACKUP) \\ |
1565 |
\t\$(NOECHO) umask 022; \$(MOD_BACKUP) \\ |
1558 |
/; |
1566 |
/; |
1559 |
foreach my $key (qw/KOHA_CONF_DIR INTRANET_TMPL_DIR INTRANET_WWW_DIR OPAC_TMPL_DIR OPAC_WWW_DIR |
1567 |
foreach my $key (qw/KOHA_CONF_DIR INTRANET_TMPL_DIR INTRANET_WWW_DIR OPAC_TMPL_DIR OPAC_WWW_DIR |
1560 |
PAZPAR2_CONF_DIR ZEBRA_CONF_DIR/) { |
1568 |
PAZPAR2_CONF_DIR ZEBRA_CONF_DIR PLUGINS_DIR/) { |
1561 |
$upgrade .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n" |
1569 |
$upgrade .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n" |
1562 |
unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or |
1570 |
unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or |
1563 |
exists $skip_directories->{$key} or |
1571 |
exists $skip_directories->{$key} or |