|
Lines 306-311
my $target_map = {
Link Here
|
| 306 |
'./skel' => 'NONE', |
306 |
'./skel' => 'NONE', |
| 307 |
'./skel/var/log/koha' => { target => 'LOG_DIR', trimdir => -1 }, |
307 |
'./skel/var/log/koha' => { target => 'LOG_DIR', trimdir => -1 }, |
| 308 |
'./skel/var/spool/koha' => { target => 'BACKUP_DIR', trimdir => -1 }, |
308 |
'./skel/var/spool/koha' => { target => 'BACKUP_DIR', trimdir => -1 }, |
|
|
309 |
'./skel/var/run/koha/plack' => { target => 'PLACK_RUN_DIR', trimdir => -1 }, |
| 309 |
'./skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 }, |
310 |
'./skel/var/run/koha/zebradb' => { target => 'ZEBRA_RUN_DIR', trimdir => -1 }, |
| 310 |
'./skel/var/lock/koha/zebradb/authorities' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 }, |
311 |
'./skel/var/lock/koha/zebradb/authorities' => { target => 'ZEBRA_LOCK_DIR', trimdir => 6 }, |
| 311 |
'./skel/var/lib/koha/zebradb/authorities/key' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
312 |
'./skel/var/lib/koha/zebradb/authorities/key' => { target => 'ZEBRA_DATA_DIR', trimdir => 6 }, |
|
Lines 354-359
Koha from a git clone with no fuss).
Link Here
|
| 354 |
Directory under which most components will go. Default |
355 |
Directory under which most components will go. Default |
| 355 |
value will vary depending on INSTALL_MODE. |
356 |
value will vary depending on INSTALL_MODE. |
| 356 |
|
357 |
|
|
|
358 |
=item INTRANET_DNS |
| 359 |
|
| 360 |
Set the DNS entry for staff client |
| 361 |
|
| 362 |
=item OPAC_DNS |
| 363 |
|
| 364 |
Set the DNS entry for OPAC |
| 365 |
|
| 366 |
=item INTRANET_PORT |
| 367 |
|
| 368 |
Set the port for the staff client |
| 369 |
|
| 370 |
=item OPAC_PORT |
| 371 |
|
| 372 |
Set the port for the OPAC |
| 373 |
|
| 357 |
=item DB_TYPE |
374 |
=item DB_TYPE |
| 358 |
|
375 |
|
| 359 |
Type of DBMS (e.g., mysql or Pg). |
376 |
Type of DBMS (e.g., mysql or Pg). |
|
Lines 414-419
System group that will own Koha's files.
Link Here
|
| 414 |
|
431 |
|
| 415 |
# default configuration options |
432 |
# default configuration options |
| 416 |
my %config_defaults = ( |
433 |
my %config_defaults = ( |
|
|
434 |
'INTRANET_DNS' => 'localhost', |
| 435 |
'OPAC_DNS' => 'localhost', |
| 436 |
'INTRANET_PORT' => '8080', |
| 437 |
'OPAC_PORT' => '80', |
| 417 |
'DB_TYPE' => 'mysql', |
438 |
'DB_TYPE' => 'mysql', |
| 418 |
'DB_HOST' => 'localhost', |
439 |
'DB_HOST' => 'localhost', |
| 419 |
'DB_NAME' => 'koha', |
440 |
'DB_NAME' => 'koha', |
|
Lines 505-513
get_file_map($target_map, $dirtree, $file_map, $config{'INSTALL_ZEBRA'} eq "yes"
Link Here
|
| 505 |
my $pl_files = { |
526 |
my $pl_files = { |
| 506 |
'rewrite-config.PL' => [ |
527 |
'rewrite-config.PL' => [ |
| 507 |
'blib/KOHA_CONF_DIR/koha-conf.xml', |
528 |
'blib/KOHA_CONF_DIR/koha-conf.xml', |
| 508 |
'blib/KOHA_CONF_DIR/koha-httpd.conf', |
529 |
'blib/KOHA_CONF_DIR/koha-nginx.conf', |
| 509 |
'blib/ZEBRA_CONF_DIR/etc/default.idx', |
530 |
'blib/ZEBRA_CONF_DIR/etc/default.idx', |
| 510 |
'blib/MISC_DIR/koha-install-log' |
531 |
'blib/MISC_DIR/koha-install-log', |
|
|
532 |
'blib/KOHA_CONF_DIR/koha-httpd.conf', |
| 533 |
'blib/SCRIPT_DIR/koha.psgi', |
| 534 |
'blib/SCRIPT_DIR/koha-plack.sh', |
| 511 |
], |
535 |
], |
| 512 |
'fix-perl-path.PL' => [ # this script ensures the correct shebang line for the platform installed on... |
536 |
'fix-perl-path.PL' => [ # this script ensures the correct shebang line for the platform installed on... |
| 513 |
'blib' |
537 |
'blib' |
|
Lines 567-572
my %test_suite_override_dirs = (
Link Here
|
| 567 |
ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'], |
591 |
ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'], |
| 568 |
ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'], |
592 |
ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'], |
| 569 |
ZEBRA_RUN_DIR => ['var', 'run', 'zebradb'], |
593 |
ZEBRA_RUN_DIR => ['var', 'run', 'zebradb'], |
|
|
594 |
PLACK_RUN_DIR => ['var', 'run', 'plack'], |
| 570 |
); |
595 |
); |
| 571 |
|
596 |
|
| 572 |
WriteMakefile( |
597 |
WriteMakefile( |
|
Lines 873-878
Group);
Link Here
|
| 873 |
} |
898 |
} |
| 874 |
|
899 |
|
| 875 |
$msg = q( |
900 |
$msg = q( |
|
|
901 |
Please specify if you would like a DNS |
| 902 |
entry for the Koha Staff Client. |
| 903 |
|
| 904 |
Intranet DNS Settings); |
| 905 |
$config{'INTRANET_DNS'} = _get_value('INTRANET_DNS', $msg, $defaults->{'INTRANET_DNS'}, $valid_values, $install_log_values); |
| 906 |
|
| 907 |
$msg = q( |
| 908 |
Please specify if you would like a DNS |
| 909 |
entry for the Koha OPAC. |
| 910 |
|
| 911 |
OPAC DNS Settings); |
| 912 |
$config{'OPAC_DNS'} = _get_value('OPAC_DNS', $msg, $defaults->{'OPAC_DNS'}, $valid_values, $install_log_values); |
| 913 |
|
| 914 |
$msg = q( |
| 915 |
Please specify the port you would |
| 916 |
like the Koha Staff Client to use. |
| 917 |
|
| 918 |
Intranet Port Settings); |
| 919 |
$config{'INTRANET_PORT'} = _get_value('INTRANET_PORT', $msg, $defaults->{'INTRANET_PORT'}, $valid_values, $install_log_values); |
| 920 |
$msg = q( |
| 921 |
Please specify the port you would |
| 922 |
like the Koha OPAC to use. |
| 923 |
|
| 924 |
OPAC Port Settings); |
| 925 |
$config{'OPAC_PORT'} = _get_value('OPAC_PORt', $msg, $defaults->{'OPAC_PORT'}, $valid_values, $install_log_values); |
| 926 |
|
| 927 |
$msg = q( |
| 876 |
Please specify which database engine you will use |
928 |
Please specify which database engine you will use |
| 877 |
to store data in Koha. The choices are MySQL and |
929 |
to store data in Koha. The choices are MySQL and |
| 878 |
PostgreSQL; please note that at the moment |
930 |
PostgreSQL; please note that at the moment |
|
Lines 1246-1251
sub get_target_directories {
Link Here
|
| 1246 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'koha', 'plugins'); |
1298 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'koha', 'plugins'); |
| 1247 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1299 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
| 1248 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1300 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
|
|
1301 |
$dirmap{'PLACK_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'plack'); |
| 1249 |
} elsif ($mode eq 'dev') { |
1302 |
} elsif ($mode eq 'dev') { |
| 1250 |
my $curdir = File::Spec->rel2abs(File::Spec->curdir()); |
1303 |
my $curdir = File::Spec->rel2abs(File::Spec->curdir()); |
| 1251 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir); |
1304 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir); |
|
Lines 1277-1282
sub get_target_directories {
Link Here
|
| 1277 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'plugins'); |
1330 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'plugins'); |
| 1278 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1331 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
| 1279 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
1332 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
|
|
1333 |
$dirmap{'PLACK_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'plack'); |
| 1280 |
} else { |
1334 |
} else { |
| 1281 |
# mode is standard, i.e., 'fhs' |
1335 |
# mode is standard, i.e., 'fhs' |
| 1282 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin'); |
1336 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin'); |
|
Lines 1300-1305
sub get_target_directories {
Link Here
|
| 1300 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'plugins'); |
1354 |
$dirmap{'PLUGINS_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'plugins'); |
| 1301 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb'); |
1355 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'lib', $package, 'zebradb'); |
| 1302 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb'); |
1356 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb'); |
|
|
1357 |
$dirmap{'PLACK_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'plack'); |
| 1303 |
} |
1358 |
} |
| 1304 |
|
1359 |
|
| 1305 |
_get_env_overrides(\%dirmap); |
1360 |
_get_env_overrides(\%dirmap); |