View | Details | Raw Unified | Return to bug 16083
Collapse All | Expand All

(-)a/Makefile.PL (-71 / +82 lines)
Lines 75-104 Makefile.PL - Koha packager and installer Link Here
75
75
76
=head2 CLI PARAMETERS
76
=head2 CLI PARAMETERS
77
77
78
    --prev-install-log   Read configuration from previous installation
78
    --prev-install-log           Read configuration from previous installation
79
    --install_mode       Installation mode (dev, standard, single)
79
    --install_mode               Installation mode (dev, standard, single)
80
    --db_type            Database (mysql, Pg)
80
    --db_type                    Database (mysql, Pg)
81
    --db_host            Database host (e.g. localhost)
81
    --db_host                    Database host (e.g. localhost)
82
    --db_port            Database port (e.g. 3306)
82
    --db_port                    Database port (e.g. 3306)
83
    --db_name            Database name (e.g. koha)
83
    --db_name                    Database name (e.g. koha)
84
    --db_user            Database user (e.g. kohaadmin)
84
    --db_user                    Database user (e.g. kohaadmin)
85
    --db_pass            Database password (e.g. katikoan)
85
    --db_pass                    Database password (e.g. katikoan)
86
    --zebra_marc_format  Zebra MARC format (marc21, normarc, unimarc)
86
    --zebra_marc_format          Zebra MARC format (marc21, normarc, unimarc)
87
    --zebra_language     Zebra language (e.g. en)
87
    --zebra_language             Zebra language (e.g. en)
88
    --zebra_tokenizer    Zebra tokenizer (chr, icu)
88
    --zebra_tokenizer            Zebra tokenizer (chr, icu)
89
    --zebra_user         Zebra user (e.g. kohauser)
89
    --zebra_user                 Zebra user (e.g. kohauser)
90
    --zebra_pass         Zebra password (e.g. zebrastripes)
90
    --zebra_pass                 Zebra password (e.g. zebrastripes)
91
    --auth_index_mode    Authority index mode (grs1, dom)
91
    --zebra_sru_host             Zebra SRU servername (e.g. localhost)
92
    --bib_index_mode     Bibliographic index mode (grs1, dom)
92
    --zebra_sru_biblios_port     Zebra SRU biblios port (e.g. 9998)
93
    --koha_user          Koha Unix user (e.g. koha)
93
    --zebra_sru_authorities_port Zebra SRU biblios port (e.g. 9999)
94
    --koha_group         Koha Unix group (e.g. koha)
94
    --auth_index_mode            Authority index mode (grs1, dom)
95
    --install_sru        Install the SRU server (yes, no)
95
    --bib_index_mode             Bibliographic index mode (grs1, dom)
96
    --install_pazpar2    Install PazPar2 (yes, no)
96
    --koha_user                  Koha Unix user (e.g. koha)
97
    --use_memcached      Use Memcached (yes, no)
97
    --koha_group                 Koha Unix group (e.g. koha)
98
    --font_dir           Location of fonts (e.g. /usr/share/fonts/truetype/ttf-dejavu)
98
    --install_sru                Install the SRU server (yes, no)
99
    --run_database_tests Run database dependent tests (yes, no)
99
    --install_pazpar2            Install PazPar2 (yes, no)
100
    --install_base       Base directory of installation (e.g. /usr/share/koha)
100
    --use_memcached              Use Memcached (yes, no)
101
    --help               Display this help message
101
    --font_dir                   Location of fonts (e.g. /usr/share/fonts/truetype/ttf-dejavu)
102
    --run_database_tests         Run database dependent tests (yes, no)
103
    --install_base               Base directory of installation (e.g. /usr/share/koha)
104
    --help                       Display this help message
102
105
103
=head1 DESCRIPTION
106
=head1 DESCRIPTION
104
107
Lines 523-528 my $cli_zebra_language = "", Link Here
523
my $cli_zebra_tokenizer = "";
526
my $cli_zebra_tokenizer = "";
524
my $cli_zebra_user = "";
527
my $cli_zebra_user = "";
525
my $cli_zebra_pass = "";
528
my $cli_zebra_pass = "";
529
my $cli_zebra_sru_host = "";
530
my $cli_zebra_sru_bib_port = "";
531
my $cli_zebra_sru_auth_port = "";
526
my $cli_koha_auth_index_mode = "";
532
my $cli_koha_auth_index_mode = "";
527
my $cli_koha_bib_index_mode = "";
533
my $cli_koha_bib_index_mode = "";
528
my $cli_koha_user = "";
534
my $cli_koha_user = "";
Lines 535-564 my $cli_koha_run_database_tests = ""; Link Here
535
my $cli_koha_install_base = "";
541
my $cli_koha_install_base = "";
536
Getopt::Long::Configure('pass_through');
542
Getopt::Long::Configure('pass_through');
537
my $results = GetOptions(
543
my $results = GetOptions(
538
    "prev-install-log=s"   => \$koha_install_log,
544
    "prev-install-log=s"           => \$koha_install_log,
539
    "install_mode=s"       => \$cli_koha_install_mode,
545
    "install_mode=s"               => \$cli_koha_install_mode,
540
    "db_type=s"            => \$cli_koha_db_type,
546
    "db_type=s"                    => \$cli_koha_db_type,
541
    "db_host=s"            => \$cli_koha_db_host,
547
    "db_host=s"                    => \$cli_koha_db_host,
542
    "db_port=s"            => \$cli_koha_db_port,
548
    "db_port=s"                    => \$cli_koha_db_port,
543
    "db_name=s"            => \$cli_koha_db_name,
549
    "db_name=s"                    => \$cli_koha_db_name,
544
    "db_user=s"            => \$cli_koha_db_user,
550
    "db_user=s"                    => \$cli_koha_db_user,
545
    "db_pass=s"            => \$cli_koha_db_pass,
551
    "db_pass=s"                    => \$cli_koha_db_pass,
546
    "zebra_marc_format=s"  => \$cli_zebra_marc_format,
552
    "zebra_marc_format=s"          => \$cli_zebra_marc_format,
547
    "zebra_language=s"     => \$cli_zebra_language,
553
    "zebra_language=s"             => \$cli_zebra_language,
548
    "zebra_tokenizer=s"    => \$cli_zebra_tokenizer,
554
    "zebra_tokenizer=s"            => \$cli_zebra_tokenizer,
549
    "zebra_user=s"         => \$cli_zebra_user,
555
    "zebra_user=s"                 => \$cli_zebra_user,
550
    "zebra_pass=s"         => \$cli_zebra_pass,
556
    "zebra_pass=s"                 => \$cli_zebra_pass,
551
    "auth_index_mode=s"    => \$cli_koha_auth_index_mode,
557
    "zebra_sru_host=s"             => \$cli_zebra_sru_host,
552
    "bib_index_mode=s"     => \$cli_koha_bib_index_mode,
558
    "zebra_sru_biblios_port=s"     => \$cli_zebra_sru_bib_port,
553
    "koha_user=s"          => \$cli_koha_user,
559
    "zebra_sru_authorities_port=s" => \$cli_zebra_sru_auth_port,
554
    "koha_group=s"         => \$cli_koha_group,
560
    "auth_index_mode=s"            => \$cli_koha_auth_index_mode,
555
    "install_sru=s"        => \$cli_koha_install_sru,
561
    "bib_index_mode=s"             => \$cli_koha_bib_index_mode,
556
    "install_pazpar2=s"    => \$cli_koha_install_pazpar2,
562
    "koha_user=s"                  => \$cli_koha_user,
557
    "use_memcached=s"      => \$cli_koha_use_memcached,
563
    "koha_group=s"                 => \$cli_koha_group,
558
    "font_dir=s"           => \$cli_koha_font_dir,
564
    "install_sru=s"                => \$cli_koha_install_sru,
559
    "run_database_tests=s" => \$cli_koha_run_database_tests,
565
    "install_pazpar2=s"            => \$cli_koha_install_pazpar2,
560
    "install_base=s"       => \$cli_koha_install_base,
566
    "use_memcached=s"              => \$cli_koha_use_memcached,
561
    "help"                 => sub { HelpMessage(0) },
567
    "font_dir=s"                   => \$cli_koha_font_dir,
568
    "run_database_tests=s"         => \$cli_koha_run_database_tests,
569
    "install_base=s"               => \$cli_koha_install_base,
570
    "help"                         => sub { HelpMessage(0) },
562
) or HelpMessage(1);
571
) or HelpMessage(1);
563
572
564
my %install_log_values = ();
573
my %install_log_values = ();
Lines 821-848 Reads values provided on cli for configuration values Link Here
821
sub get_cli_values {
830
sub get_cli_values {
822
    my $values = shift;
831
    my $values = shift;
823
    my $map = {
832
    my $map = {
824
        INSTALL_MODE       => $cli_koha_install_mode,
833
        INSTALL_MODE               => $cli_koha_install_mode,
825
        DB_TYPE            => $cli_koha_db_type,
834
        DB_TYPE                    => $cli_koha_db_type,
826
        DB_HOST            => $cli_koha_db_host,
835
        DB_HOST                    => $cli_koha_db_host,
827
        DB_PORT            => $cli_koha_db_port,
836
        DB_PORT                    => $cli_koha_db_port,
828
        DB_NAME            => $cli_koha_db_name,
837
        DB_NAME                    => $cli_koha_db_name,
829
        DB_USER            => $cli_koha_db_user,
838
        DB_USER                    => $cli_koha_db_user,
830
        DB_PASS            => $cli_koha_db_pass,
839
        DB_PASS                    => $cli_koha_db_pass,
831
        ZEBRA_MARC_FORMAT  => $cli_zebra_marc_format,
840
        ZEBRA_MARC_FORMAT          => $cli_zebra_marc_format,
832
        ZEBRA_LANGUAGE     => $cli_zebra_language,
841
        ZEBRA_LANGUAGE             => $cli_zebra_language,
833
        ZEBRA_TOKENIZER    => $cli_zebra_tokenizer,
842
        ZEBRA_TOKENIZER            => $cli_zebra_tokenizer,
834
        ZEBRA_USER         => $cli_zebra_user,
843
        ZEBRA_USER                 => $cli_zebra_user,
835
        ZEBRA_PASS         => $cli_zebra_pass,
844
        ZEBRA_PASS                 => $cli_zebra_pass,
836
        AUTH_INDEX_MODE    => $cli_koha_auth_index_mode,
845
        ZEBRA_SRU_HOST             => $cli_zebra_sru_host,
837
        BIB_INDEX_MODE     => $cli_koha_bib_index_mode,
846
        ZEBRA_SRU_BIBLIOS_PORT     => $cli_zebra_sru_bib_port,
838
        KOHA_USER          => $cli_koha_user,
847
        ZEBRA_SRU_AUTHORITIES_PORT => $cli_zebra_sru_auth_port,
839
        KOHA_GROUP         => $cli_koha_group,
848
        AUTH_INDEX_MODE            => $cli_koha_auth_index_mode,
840
        INSTALL_SRU        => $cli_koha_install_sru,
849
        BIB_INDEX_MODE             => $cli_koha_bib_index_mode,
841
        INSTALL_PAZPAR2    => $cli_koha_install_pazpar2,
850
        KOHA_USER                  => $cli_koha_user,
842
        USE_MEMCACHED      => $cli_koha_use_memcached,
851
        KOHA_GROUP                 => $cli_koha_group,
843
        FONT_DIR           => $cli_koha_font_dir,
852
        INSTALL_SRU                => $cli_koha_install_sru,
844
        RUN_DATABASE_TESTS => $cli_koha_run_database_tests,
853
        INSTALL_PAZPAR2            => $cli_koha_install_pazpar2,
845
        INSTALL_BASE       => $cli_koha_install_base
854
        USE_MEMCACHED              => $cli_koha_use_memcached,
855
        FONT_DIR                   => $cli_koha_font_dir,
856
        RUN_DATABASE_TESTS         => $cli_koha_run_database_tests,
857
        INSTALL_BASE               => $cli_koha_install_base
846
    };
858
    };
847
    foreach my $key (keys %{$map}) {
859
    foreach my $key (keys %{$map}) {
848
        $values->{$key} = $map->{$key} if ($map->{$key});
860
        $values->{$key} = $map->{$key} if ($map->{$key});
849
- 

Return to bug 16083