|
Lines 298-303
my $target_map = {
Link Here
|
| 298 |
'./skel' => 'NONE', |
298 |
'./skel' => 'NONE', |
| 299 |
'./skel/var/log/koha' => { target => 'LOG_DIR', trimdir => -1 }, |
299 |
'./skel/var/log/koha' => { target => 'LOG_DIR', trimdir => -1 }, |
| 300 |
'./skel/var/spool/koha' => { target => 'BACKUP_DIR', trimdir => -1 }, |
300 |
'./skel/var/spool/koha' => { target => 'BACKUP_DIR', trimdir => -1 }, |
|
|
301 |
'./skel/var/run/koha/plack' => { target => 'PLACK_RUN_DIR', trimdir => -1 }, |
| 301 |
'./skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 }, |
302 |
'./skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 }, |
| 302 |
'./skel/var/lock/koha/zebradb/authorities' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 }, |
303 |
'./skel/var/lock/koha/zebradb/authorities' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 }, |
| 303 |
'./skel/var/lib/koha/zebradb/authorities/key' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
304 |
'./skel/var/lib/koha/zebradb/authorities/key' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
|
Lines 345-350
Koha from a git clone with no fuss).
Link Here
|
| 345 |
Directory under which most components will go. Default |
346 |
Directory under which most components will go. Default |
| 346 |
value will vary depending on INSTALL_MODE. |
347 |
value will vary depending on INSTALL_MODE. |
| 347 |
|
348 |
|
|
|
349 |
=item INTRANET_DNS |
| 350 |
|
| 351 |
Set the DNS entry for staff client |
| 352 |
|
| 353 |
=item OPAC_DNS |
| 354 |
|
| 355 |
Set the DNS entry for OPAC |
| 356 |
|
| 357 |
=item INTRANET_PORT |
| 358 |
|
| 359 |
Set the port for the staff client |
| 360 |
|
| 361 |
=item OPAC_PORT |
| 362 |
|
| 363 |
Set the port for the OPAC |
| 364 |
|
| 348 |
=item DB_TYPE |
365 |
=item DB_TYPE |
| 349 |
|
366 |
|
| 350 |
Type of DBMS (e.g., mysql or Pg). |
367 |
Type of DBMS (e.g., mysql or Pg). |
|
Lines 405-410
System group that will own Koha's files.
Link Here
|
| 405 |
|
422 |
|
| 406 |
# default configuration options |
423 |
# default configuration options |
| 407 |
my %config_defaults = ( |
424 |
my %config_defaults = ( |
|
|
425 |
'INTRANET_DNS' => 'localhost', |
| 426 |
'OPAC_DNS' => 'localhost', |
| 427 |
'INTRANET_PORT' => '8080', |
| 428 |
'OPAC_PORT' => '80', |
| 408 |
'DB_TYPE' => 'mysql', |
429 |
'DB_TYPE' => 'mysql', |
| 409 |
'DB_HOST' => 'localhost', |
430 |
'DB_HOST' => 'localhost', |
| 410 |
'DB_NAME' => 'koha', |
431 |
'DB_NAME' => 'koha', |
|
Lines 496-504
get_file_map($target_map, $dirtree, $file_map, $config{'INSTALL_ZEBRA'} eq "yes"
Link Here
|
| 496 |
my $pl_files = { |
517 |
my $pl_files = { |
| 497 |
'rewrite-config.PL' => [ |
518 |
'rewrite-config.PL' => [ |
| 498 |
'blib/KOHA_CONF_DIR/koha-conf.xml', |
519 |
'blib/KOHA_CONF_DIR/koha-conf.xml', |
| 499 |
'blib/KOHA_CONF_DIR/koha-httpd.conf', |
520 |
'blib/KOHA_CONF_DIR/koha-nginx.conf', |
| 500 |
'blib/ZEBRA_CONF_DIR/etc/default.idx', |
521 |
'blib/ZEBRA_CONF_DIR/etc/default.idx', |
| 501 |
'blib/MISC_DIR/koha-install-log' |
522 |
'blib/MISC_DIR/koha-install-log', |
|
|
523 |
'blib/KOHA_CONF_DIR/koha-httpd.conf', |
| 524 |
'blib/SCRIPT_DIR/koha.psgi', |
| 525 |
'blib/SCRIPT_DIR/koha-plack.sh', |
| 502 |
], |
526 |
], |
| 503 |
'fix-perl-path.PL' => [ # this script ensures the correct shebang line for the platform installed on... |
527 |
'fix-perl-path.PL' => [ # this script ensures the correct shebang line for the platform installed on... |
| 504 |
'blib' |
528 |
'blib' |
|
Lines 559-564
my %test_suite_override_dirs = (
Link Here
|
| 559 |
ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'], |
583 |
ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'], |
| 560 |
ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'], |
584 |
ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'], |
| 561 |
ZEBRA_RUN_DIR => ['var', 'run', 'zebradb'], |
585 |
ZEBRA_RUN_DIR => ['var', 'run', 'zebradb'], |
|
|
586 |
PLACK_RUN_DIR => ['var', 'run', 'plack'], |
| 562 |
); |
587 |
); |
| 563 |
|
588 |
|
| 564 |
WriteMakefile( |
589 |
WriteMakefile( |
|
Lines 865-870
Group);
Link Here
|
| 865 |
} |
890 |
} |
| 866 |
|
891 |
|
| 867 |
$msg = q( |
892 |
$msg = q( |
|
|
893 |
Please specify if you would like a DNS |
| 894 |
entry for the Koha Staff Client. |
| 895 |
|
| 896 |
Intranet DNS Settings); |
| 897 |
$config{'INTRANET_DNS'} = _get_value('INTRANET_DNS', $msg, $defaults->{'INTRANET_DNS'}, $valid_values, $install_log_values); |
| 898 |
|
| 899 |
$msg = q( |
| 900 |
Please specify if you would like a DNS |
| 901 |
entry for the Koha OPAC. |
| 902 |
|
| 903 |
OPAC DNS Settings); |
| 904 |
$config{'OPAC_DNS'} = _get_value('OPAC_DNS', $msg, $defaults->{'OPAC_DNS'}, $valid_values, $install_log_values); |
| 905 |
|
| 906 |
$msg = q( |
| 907 |
Please specify the port you would |
| 908 |
like the Koha Staff Client to use. |
| 909 |
|
| 910 |
Intranet Port Settings); |
| 911 |
$config{'INTRANET_PORT'} = _get_value('INTRANET_PORT', $msg, $defaults->{'INTRANET_PORT'}, $valid_values, $install_log_values); |
| 912 |
$msg = q( |
| 913 |
Please specify the port you would |
| 914 |
like the Koha OPAC to use. |
| 915 |
|
| 916 |
OPAC Port Settings); |
| 917 |
$config{'OPAC_PORT'} = _get_value('OPAC_PORt', $msg, $defaults->{'OPAC_PORT'}, $valid_values, $install_log_values); |
| 918 |
|
| 919 |
$msg = q( |
| 868 |
Please specify which database engine you will use |
920 |
Please specify which database engine you will use |
| 869 |
to store data in Koha. The choices are MySQL and |
921 |
to store data in Koha. The choices are MySQL and |
| 870 |
PostgreSQL; please note that at the moment |
922 |
PostgreSQL; please note that at the moment |
|
Lines 1237-1242
sub get_target_directories {
Link Here
|
| 1237 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
1289 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
| 1238 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1290 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
| 1239 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1291 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
|
|
1292 |
$dirmap{'PLACK_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'plack'); |
| 1240 |
} elsif ($mode eq 'dev') { |
1293 |
} elsif ($mode eq 'dev') { |
| 1241 |
my $curdir = File::Spec->rel2abs(File::Spec->curdir()); |
1294 |
my $curdir = File::Spec->rel2abs(File::Spec->curdir()); |
| 1242 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir); |
1295 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir); |
|
Lines 1267-1272
sub get_target_directories {
Link Here
|
| 1267 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
1320 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
| 1268 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1321 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
| 1269 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1322 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
|
|
1323 |
$dirmap{'PLACK_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'plack'); |
| 1270 |
} else { |
1324 |
} else { |
| 1271 |
# mode is standard, i.e., 'fhs' |
1325 |
# mode is standard, i.e., 'fhs' |
| 1272 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin'); |
1326 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin'); |
|
Lines 1289-1294
sub get_target_directories {
Link Here
|
| 1289 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'spool', $package); |
1343 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'spool', $package); |
| 1290 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb'); |
1344 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb'); |
| 1291 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb'); |
1345 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb'); |
|
|
1346 |
$dirmap{'PLACK_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'plack'); |
| 1292 |
} |
1347 |
} |
| 1293 |
|
1348 |
|
| 1294 |
_get_env_overrides(\%dirmap); |
1349 |
_get_env_overrides(\%dirmap); |