Attachment 58555 Details for Bug 16083 – Bug 16083 Allow cli overrides for makefile settings.

[patch] Bug 16083 Allow cli overrides for makefile settings.

Bug-16083-Allow-cli-overrides-for-makefile-setting.patch (text/plain), 7.46 KB, created by Jonathan Druart on 2017-01-02 11:30:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-01-02 11:30:51 UTC

Size: 7.46 KB

patch

obsolete

>From 81ed18654bf360babb46c7d748f0918e6d7fcee8 Mon Sep 17 00:00:00 2001
>From: Alex Sassmannshausen <alex.sassmannshausen@ptfs-europe.com>
>Date: Wed, 16 Mar 2016 17:04:48 +0100
>Subject: [PATCH] Bug 16083 Allow cli overrides for makefile settings.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Currently the Makefile.pl script only accepts the '--prev-install-log' commandline flag for reading Koha configuration values from the previous installation.
>
>The Makefile does not have help output.
>
>The aim of this bug report is to add 2 things:
>- --help output
>- commandline parameters that should allow automating many of the common settings if desired
>- when commandline parameters are not passed we simply fall back to the interactive method of old
>
>Test Plan:
>
>- Run the Makefile without parameters â the script should work as before.
>- Run the script with the '-h' flag â it should output help.
>- Run the script with any number of additional legal flags â the script should skip those questions in its interactive mode.
>
>Signed-off-by: Nicolas Legrand <nicolas.legrand@bulac.fr>
>Reworked the log message with Bugzilla comments.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>Amended patch: perltidy GetOptions block
>---
> Makefile.PL | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 116 insertions(+), 3 deletions(-)
>
>diff --git a/Makefile.PL b/Makefile.PL
>index 4c2f6f9..ded38ac 100644
>--- a/Makefile.PL
>+++ b/Makefile.PL
>@@ -1,4 +1,5 @@
> # Copyright 2007 MJ Ray
>+# Copyright 2016 PTFS Europe
> #
> # This file is part of Koha.
> #
>@@ -23,7 +24,7 @@ use warnings;
> use ExtUtils::MakeMaker;
> use POSIX;
> use File::Spec;
>-use Getopt::Long;
>+use Getopt::Long qw/HelpMessage/;
> use FindBin; # we need to enforce which C4::Installer::PerlModule is used in case more than one is installed
> 
> use lib $FindBin::Bin;
>@@ -72,6 +73,33 @@ Makefile.PL - Koha packager and installer
> 
> 	make clean
> 
>+=head2 CLI PARAMETERS
>+
>+    --prev-install-log   Read configuration from previous installation
>+    --install_mode       Installation mode (dev, standard, single)
>+    --db_type            Database (mysql, Pg)
>+    --db_host            Database host (e.g. localhost)
>+    --db_port            Database port (e.g. 3306)
>+    --db_name            Database name (e.g. koha)
>+    --db_user            Database user (e.g. kohaadmin)
>+    --db_pass            Database password (e.g. katikoan)
>+    --zebra_marc_format  Zebra MARC format (marc21, normarc, unimarc)
>+    --zebra_language     Zebra language (e.g. en)
>+    --zebra_tokenizer    Zebra tokenizer (chr, icu)
>+    --zebra_user         Zebra user (e.g. kohauser)
>+    --zebra_pass         Zebra password (e.g. zebrastripes)
>+    --auth_index_mode    Authority index mode (grs1, dom)
>+    --bib_index_mode     Bibliographic index mode (grs1, dom)
>+    --koha_user          Koha Unix user (e.g. koha)
>+    --koha_group         Koha Unix group (e.g. koha)
>+    --install_sru        Install the SRU server (yes, no)
>+    --install_pazpar2    Install PazPar2 (yes, no)
>+    --use_memcached      Use Memcached (yes, no)
>+    --font_dir           Location of fonts (e.g. /usr/share/fonts/truetype/ttf-dejavu)
>+    --run_database_tests Run database dependent tests (yes, no)
>+    --install_base       Base directory of installation (e.g. /usr/share/koha)
>+    --help               Display this help message
>+
> =head1 DESCRIPTION
> 
> This is a packager and installer that uses
>@@ -483,14 +511,62 @@ my %valid_config_values = (
> 
> # get settings from command-line
> my $koha_install_log = "";
>+my $cli_koha_install_mode = "";
>+my $cli_koha_db_type = "";
>+my $cli_koha_db_host = "";
>+my $cli_koha_db_port = "";
>+my $cli_koha_db_name = "";
>+my $cli_koha_db_user = "";
>+my $cli_koha_db_pass = "";
>+my $cli_zebra_marc_format = "";
>+my $cli_zebra_language = "",
>+my $cli_zebra_tokenizer = "";
>+my $cli_zebra_user = "";
>+my $cli_zebra_pass = "";
>+my $cli_koha_auth_index_mode = "";
>+my $cli_koha_bib_index_mode = "";
>+my $cli_koha_user = "";
>+my $cli_koha_group = "";
>+my $cli_koha_install_sru = "";
>+my $cli_koha_install_pazpar2 = "";
>+my $cli_koha_use_memcached = "";
>+my $cli_koha_font_dir = "";
>+my $cli_koha_run_database_tests = "";
>+my $cli_koha_install_base = "";
> Getopt::Long::Configure('pass_through');
> my $results = GetOptions(
>-    "prev-install-log=s" => \$koha_install_log
>-);
>+    "prev-install-log=s"   => \$koha_install_log,
>+    "install_mode=s"       => \$cli_koha_install_mode,
>+    "db_type=s"            => \$cli_koha_db_type,
>+    "db_host=s"            => \$cli_koha_db_host,
>+    "db_port=s"            => \$cli_koha_db_port,
>+    "db_name=s"            => \$cli_koha_db_name,
>+    "db_user=s"            => \$cli_koha_db_user,
>+    "db_pass=s"            => \$cli_koha_db_pass,
>+    "zebra_marc_format=s"  => \$cli_zebra_marc_format,
>+    "zebra_language=s"     => \$cli_zebra_language,
>+    "zebra_tokenizer=s"    => \$cli_zebra_tokenizer,
>+    "zebra_user=s"         => \$cli_zebra_user,
>+    "zebra_pass=s"         => \$cli_zebra_pass,
>+    "auth_index_mode=s"    => \$cli_koha_auth_index_mode,
>+    "bib_index_mode=s"     => \$cli_koha_bib_index_mode,
>+    "koha_user=s"          => \$cli_koha_user,
>+    "koha_group=s"         => \$cli_koha_group,
>+    "install_sru=s"        => \$cli_koha_install_sru,
>+    "install_pazpar2=s"    => \$cli_koha_install_pazpar2,
>+    "use_memcached=s"      => \$cli_koha_use_memcached,
>+    "font_dir=s"           => \$cli_koha_font_dir,
>+    "run_database_tests=s" => \$cli_koha_run_database_tests,
>+    "install_base=s"       => \$cli_koha_install_base,
>+    "help"                 => sub { HelpMessage(0) },
>+) or HelpMessage(1);
> 
> my %install_log_values = ();
> if ($koha_install_log ne "") {
>     get_install_log_values($koha_install_log, \%install_log_values);
>+} else {
>+    # Try to set install_log_values for provided values;
>+    get_cli_values(\%install_log_values);
> }
> 
> my %config = get_configuration(\%config_defaults, \%valid_config_values, \%install_log_values);
>@@ -736,6 +812,43 @@ sub _add_to_file_map {
>     }
> }
> 
>+=head2 get_cli_values
>+
>+Reads values provided on cli for configuration values
>+
>+=cut
>+
>+sub get_cli_values {
>+    my $values = shift;
>+    my $map = {
>+        INSTALL_MODE       => $cli_koha_install_mode,
>+        DB_TYPE            => $cli_koha_db_type,
>+        DB_HOST            => $cli_koha_db_host,
>+        DB_PORT            => $cli_koha_db_port,
>+        DB_NAME            => $cli_koha_db_name,
>+        DB_USER            => $cli_koha_db_user,
>+        DB_PASS            => $cli_koha_db_pass,
>+        ZEBRA_MARC_FORMAT  => $cli_zebra_marc_format,
>+        ZEBRA_LANGUAGE     => $cli_zebra_language,
>+        ZEBRA_TOKENIZER    => $cli_zebra_tokenizer,
>+        ZEBRA_USER         => $cli_zebra_user,
>+        ZEBRA_PASS         => $cli_zebra_pass,
>+        AUTH_INDEX_MODE    => $cli_koha_auth_index_mode,
>+        BIB_INDEX_MODE     => $cli_koha_bib_index_mode,
>+        KOHA_USER          => $cli_koha_user,
>+        KOHA_GROUP         => $cli_koha_group,
>+        INSTALL_SRU        => $cli_koha_install_sru,
>+        INSTALL_PAZPAR2    => $cli_koha_install_pazpar2,
>+        USE_MEMCACHED      => $cli_koha_use_memcached,
>+        FONT_DIR           => $cli_koha_font_dir,
>+        RUN_DATABASE_TESTS => $cli_koha_run_database_tests,
>+        INSTALL_BASE       => $cli_koha_install_base
>+    };
>+    foreach my $key (keys %{$map}) {
>+        $values->{$key} = $map->{$key} if ($map->{$key});
>+    }
>+}
>+
> =head2 get_install_log_values
> 
> Reads value from the Koha install log specified by
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 16083: 49235 | 56396 | 58555 | 58612