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 WEBSERVER |
350 |
|
351 |
Type of WebServer ( Apache2 or NGINX). |
352 |
|
353 |
=item INTRANET_DNS |
354 |
|
355 |
Set the DNS entry for staff client |
356 |
|
357 |
=item OPAC_DNS |
358 |
|
359 |
Set the DNS entry for OPAC |
360 |
|
361 |
=item INTRANET_PORT |
362 |
|
363 |
Set the port for the staff client |
364 |
|
365 |
=item OPAC_PORT |
366 |
|
367 |
Set the port for the OPAC |
368 |
|
348 |
=item DB_TYPE |
369 |
=item DB_TYPE |
349 |
|
370 |
|
350 |
Type of DBMS (e.g., mysql or Pg). |
371 |
Type of DBMS (e.g., mysql or Pg). |
Lines 405-410
System group that will own Koha's files.
Link Here
|
405 |
|
426 |
|
406 |
# default configuration options |
427 |
# default configuration options |
407 |
my %config_defaults = ( |
428 |
my %config_defaults = ( |
|
|
429 |
'WEBSERVER' => 'apache2', |
430 |
'INTRANET_DNS' => 'localhost', |
431 |
'OPAC_DNS' => 'localhost', |
432 |
'INTRANET_PORT' => '8080', |
433 |
'OPAC_PORT' => '80', |
408 |
'DB_TYPE' => 'mysql', |
434 |
'DB_TYPE' => 'mysql', |
409 |
'DB_HOST' => 'localhost', |
435 |
'DB_HOST' => 'localhost', |
410 |
'DB_NAME' => 'koha', |
436 |
'DB_NAME' => 'koha', |
Lines 464-469
else {
Link Here
|
464 |
my %valid_config_values = ( |
490 |
my %valid_config_values = ( |
465 |
'INSTALL_MODE' => { 'standard' => 1, 'single' => 1, 'dev' => 1 }, |
491 |
'INSTALL_MODE' => { 'standard' => 1, 'single' => 1, 'dev' => 1 }, |
466 |
'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 }, |
492 |
'DB_TYPE' => { 'mysql' => 1, 'Pg' => 1 }, |
|
|
493 |
'WEBSERVER' => { 'apache2' => 1, 'nginx' => 1 }, |
467 |
'INSTALL_ZEBRA' => { 'yes' => 1, 'no' => 1 }, |
494 |
'INSTALL_ZEBRA' => { 'yes' => 1, 'no' => 1 }, |
468 |
'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 }, |
495 |
'INSTALL_SRU' => { 'yes' => 1, 'no' => 1 }, |
469 |
'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
496 |
'AUTH_INDEX_MODE' => { 'grs1' => 1, 'dom' => 1 }, |
Lines 496-510
get_file_map($target_map, $dirtree, $file_map, $config{'INSTALL_ZEBRA'} eq "yes"
Link Here
|
496 |
my $pl_files = { |
523 |
my $pl_files = { |
497 |
'rewrite-config.PL' => [ |
524 |
'rewrite-config.PL' => [ |
498 |
'blib/KOHA_CONF_DIR/koha-conf.xml', |
525 |
'blib/KOHA_CONF_DIR/koha-conf.xml', |
499 |
'blib/KOHA_CONF_DIR/koha-httpd.conf', |
526 |
'blib/KOHA_CONF_DIR/koha-nginx.conf', |
500 |
'blib/ZEBRA_CONF_DIR/etc/default.idx', |
527 |
'blib/ZEBRA_CONF_DIR/etc/default.idx', |
501 |
'blib/MISC_DIR/koha-install-log' |
528 |
'blib/MISC_DIR/koha-install-log', |
502 |
], |
529 |
], |
503 |
'fix-perl-path.PL' => [ # this script ensures the correct shebang line for the platform installed on... |
530 |
'fix-perl-path.PL' => [ # this script ensures the correct shebang line for the platform installed on... |
504 |
'blib' |
531 |
'blib' |
505 |
], |
532 |
], |
506 |
}; |
533 |
}; |
507 |
|
534 |
|
|
|
535 |
if ($config{'WEBSERVER'} eq "apache2"){ |
536 |
push @{ $pl_files->{'rewrite-config.PL'} }, ( |
537 |
'blib/KOHA_CONF_DIR/koha-httpd.conf', |
538 |
); |
539 |
} |
540 |
else { |
541 |
push @{ $pl_files->{'rewrite-config.PL'} }, ( |
542 |
'blib/SCRIPT_DIR/koha.psgi', |
543 |
'blib/SCRIPT_DIR/koha-plack.sh', |
544 |
); |
545 |
} |
546 |
|
508 |
if ($config{'INSTALL_ZEBRA'} eq "yes") { |
547 |
if ($config{'INSTALL_ZEBRA'} eq "yes") { |
509 |
push @{ $pl_files->{'rewrite-config.PL'} }, ( |
548 |
push @{ $pl_files->{'rewrite-config.PL'} }, ( |
510 |
'blib/ZEBRA_CONF_DIR/etc/passwd', |
549 |
'blib/ZEBRA_CONF_DIR/etc/passwd', |
Lines 559-564
my %test_suite_override_dirs = (
Link Here
|
559 |
ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'], |
598 |
ZEBRA_LOCK_DIR => ['var', 'lock', 'zebradb'], |
560 |
ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'], |
599 |
ZEBRA_DATA_DIR => ['var', 'lib', 'zebradb'], |
561 |
ZEBRA_RUN_DIR => ['var', 'run', 'zebradb'], |
600 |
ZEBRA_RUN_DIR => ['var', 'run', 'zebradb'], |
|
|
601 |
PLACK_RUN_DIR => ['var', 'run', 'plack'], |
562 |
); |
602 |
); |
563 |
|
603 |
|
564 |
WriteMakefile( |
604 |
WriteMakefile( |
Lines 865-870
Group);
Link Here
|
865 |
} |
905 |
} |
866 |
|
906 |
|
867 |
$msg = q( |
907 |
$msg = q( |
|
|
908 |
Please specify which WebServer you will use |
909 |
to serve data in Koha. The choices are Apache2 and |
910 |
NGINX; please note that at the moment |
911 |
NGINX support is highly experimental. |
912 |
|
913 |
WebServer to use); |
914 |
$msg .= _add_valid_values_disp('WEBSERVER', $valid_values); |
915 |
$config{'WEBSERVER'} = _get_value('WEBSERVER', $msg, $defaults->{'WEBSERVER'}, $valid_values, $install_log_values); |
916 |
|
917 |
$msg = q( |
918 |
Please specify which WebServer you will use |
919 |
to serve data in Koha. The choices are Apache2 and |
920 |
NGINX; please note that at the moment |
921 |
NGINX support is highly experimental. |
922 |
|
923 |
Intranet DNS Settings); |
924 |
$config{'INTRANET_DNS'} = _get_value('INTRANET_DNS', $msg, $defaults->{'INTRANET_DNS'}, $valid_values, $install_log_values); |
925 |
|
926 |
$msg = q( |
927 |
Please specify if you would like a DNS |
928 |
entry for the Koha Staff Client. |
929 |
|
930 |
OPAC DNS Settings); |
931 |
$config{'OPAC_DNS'} = _get_value('OPAC_DNS', $msg, $defaults->{'OPAC_DNS'}, $valid_values, $install_log_values); |
932 |
|
933 |
$msg = q( |
934 |
Please specify the port you would |
935 |
like the Koha Staff Client to use. |
936 |
|
937 |
Intranet Port Settings); |
938 |
$config{'INTRANET_PORT'} = _get_value('INTRANET_PORT', $msg, $defaults->{'INTRANET_PORT'}, $valid_values, $install_log_values); |
939 |
$msg = q( |
940 |
Please specify if you would like a DNS |
941 |
entry for the Koha Staff Client. |
942 |
|
943 |
OPAC Port Settings); |
944 |
$config{'OPAC_PORT'} = _get_value('OPAC_PORt', $msg, $defaults->{'OPAC_PORT'}, $valid_values, $install_log_values); |
945 |
|
946 |
$msg = q( |
868 |
Please specify which database engine you will use |
947 |
Please specify which database engine you will use |
869 |
to store data in Koha. The choices are MySQL and |
948 |
to store data in Koha. The choices are MySQL and |
870 |
PostgreSQL; please note that at the moment |
949 |
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'); |
1316 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
1238 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1317 |
$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'); |
1318 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
|
|
1319 |
$dirmap{'PLACK_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'plack'); |
1240 |
} elsif ($mode eq 'dev') { |
1320 |
} elsif ($mode eq 'dev') { |
1241 |
my $curdir = File::Spec->rel2abs(File::Spec->curdir()); |
1321 |
my $curdir = File::Spec->rel2abs(File::Spec->curdir()); |
1242 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir($curdir); |
1322 |
$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'); |
1347 |
$dirmap{'BACKUP_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'spool'); |
1268 |
$dirmap{'ZEBRA_DATA_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'lib', 'zebradb'); |
1348 |
$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'); |
1349 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'zebradb'); |
|
|
1350 |
$dirmap{'PLACK_RUN_DIR'} = File::Spec->catdir(@basedir, $package, 'var', 'run', 'plack'); |
1270 |
} else { |
1351 |
} else { |
1271 |
# mode is standard, i.e., 'fhs' |
1352 |
# mode is standard, i.e., 'fhs' |
1272 |
$dirmap{'INTRANET_CGI_DIR'} = File::Spec->catdir(@basedir, $package, 'intranet', 'cgi-bin'); |
1353 |
$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); |
1370 |
$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'); |
1371 |
$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'); |
1372 |
$dirmap{'ZEBRA_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'zebradb'); |
|
|
1373 |
$dirmap{'PLACK_RUN_DIR'} = File::Spec->catdir(File::Spec->rootdir(), 'var', 'run', $package, 'plack'); |
1292 |
} |
1374 |
} |
1293 |
|
1375 |
|
1294 |
_get_env_overrides(\%dirmap); |
1376 |
_get_env_overrides(\%dirmap); |