Lines 226-231
command-line, e.g., READMEs.
Link Here
|
226 |
|
226 |
|
227 |
Directory for Apache and Zebra logs produced by Koha. |
227 |
Directory for Apache and Zebra logs produced by Koha. |
228 |
|
228 |
|
|
|
229 |
=item PLUGINS_DIR |
230 |
|
231 |
Directory for external Koha plugins. |
232 |
|
229 |
=item PAZPAR2_CONF_DIR |
233 |
=item PAZPAR2_CONF_DIR |
230 |
|
234 |
|
231 |
Directory for PazPar2 configuration files. |
235 |
Directory for PazPar2 configuration files. |
Lines 1204-1209
sub get_target_directories {
Link Here
|
1204 |
$dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc'); |
1208 |
$dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc'); |
1205 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb'); |
1209 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lock', 'zebradb'); |
1206 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'log'); |
1210 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'log'); |
|
|
1211 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'koha', 'plugins'); |
1207 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1212 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1208 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1213 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1209 |
} elsif ($mode eq 'dev') { |
1214 |
} elsif ($mode eq 'dev') { |
Lines 1233-1238
sub get_target_directories {
Link Here
|
1233 |
$dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc'); |
1238 |
$dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc'); |
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'); |
|
|
1241 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'koha', 'plugins'); |
1236 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1242 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1237 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1243 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1238 |
} else { |
1244 |
} else { |
Lines 1254-1259
sub get_target_directories {
Link Here
|
1254 |
$dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc'); |
1260 |
$dirmap{'DOC_DIR'} = File::Spec->catdir(@basedir, $package, 'doc'); |
1255 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lock', $package, 'zebradb'); |
1261 |
$dirmap{'ZEBRA_LOCK_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lock', $package, 'zebradb'); |
1256 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'log', $package); |
1262 |
$dirmap{'LOG_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'log', $package); |
|
|
1263 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'plugins'); |
1257 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb'); |
1264 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb'); |
1258 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb'); |
1265 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb'); |
1259 |
} |
1266 |
} |
Lines 1525-1531
make_upgrade_backup ::
Link Here
|
1525 |
\t\$(NOECHO) umask 022; \$(MOD_BACKUP) \\ |
1532 |
\t\$(NOECHO) umask 022; \$(MOD_BACKUP) \\ |
1526 |
/; |
1533 |
/; |
1527 |
foreach my $key (qw/KOHA_CONF_DIR INTRANET_TMPL_DIR INTRANET_WWW_DIR OPAC_TMPL_DIR OPAC_WWW_DIR |
1534 |
foreach my $key (qw/KOHA_CONF_DIR INTRANET_TMPL_DIR INTRANET_WWW_DIR OPAC_TMPL_DIR OPAC_WWW_DIR |
1528 |
PAZPAR2_CONF_DIR ZEBRA_CONF_DIR/) { |
1535 |
PAZPAR2_CONF_DIR ZEBRA_CONF_DIR PLUGINS_DIR/) { |
1529 |
$upgrade .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n" |
1536 |
$upgrade .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n" |
1530 |
unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or |
1537 |
unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or |
1531 |
exists $skip_directories->{$key} or |
1538 |
exists $skip_directories->{$key} or |