Attachment #62690 for bug #17951

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




    --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)
    --template-cache-dir         Specify a template cache directory (e.g. /var/cache/koha)
    --help                       Display this help message

=head1 DESCRIPTION

  'USE_MEMCACHED'     => 'no',
  'MEMCACHED_SERVERS' => '127.0.0.1:11211',
  'MEMCACHED_NAMESPACE' => 'KOHA',
  'TEMPLATE_CACHE_DIR' => '/tmp/koha',
  'FONT_DIR'          => '/usr/share/fonts/truetype/ttf-dejavu'
);


my $cli_koha_font_dir = "";
my $cli_koha_run_database_tests = "";
my $cli_koha_install_base = "";
my $cli_koha_template_cache_dir = "";
Getopt::Long::Configure('pass_through');
my $results = GetOptions(
    "prev-install-log=s"           => \$koha_install_log,

    "font_dir=s"                   => \$cli_koha_font_dir,
    "run_database_tests=s"         => \$cli_koha_run_database_tests,
    "install_base=s"               => \$cli_koha_install_base,
    "template-cache-dir=s"         => \$cli_koha_template_cache_dir,
    "help"                         => sub { HelpMessage(0) },
) or HelpMessage(1);


        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,
        TEMPLATE_CACHE_DIR         => $cli_koha_template_cache_dir
    };
    foreach my $key (keys %{$map}) {
        $values->{$key} = $map->{$key} if ($map->{$key});

  }

  $msg = q(
Template cache directory?);
  $config{'TEMPLATE_CACHE_DIR'} = _get_value('TEMPLATE_CACHE_DIR', $msg, $defaults->{'TEMPLATE_CACHE_DIR'}, $valid_values, $install_log_values);

  $msg = q(
Path to DejaVu fonts?);
  $config{'FONT_DIR'} = _get_value('FONT_DIR', $msg, $defaults->{'FONT_DIR'}, $valid_values, $install_log_values);


Lines 122-131 __PAZPAR2_TOGGLE_XML_POST__ Link Here

(-)a/etc/koha-conf.xml (-4 / +1 lines)
122	<log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>	122	<log4perl_conf>__KOHA_CONF_DIR__/log4perl.conf</log4perl_conf>
123	<memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>	123	<memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
124	<memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>	124	<memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
125	<!-- Uncomment the following line if you want to use template caching	125	<template_cache_dir>__TEMPLATE_CACHE_DIR__</template_cache_dir>
126	That will bring a performance boost
127	<template_cache_dir>/tmp</template_cache_dir>
128	-->
129		126
130	<!-- Secret passphrase used by Mojolicious for signed cookies -->	127	<!-- Secret passphrase used by Mojolicious for signed cookies -->
131	<api_secret_passphrase>CHANGEME</api_secret_passphrase>	128	<api_secret_passphrase>CHANGEME</api_secret_passphrase>

Lines 153-158 $prefix = $ENV{'INSTALL_BASE'} \|\| "/usr"; Link Here

(-)a/rewrite-config.PL (-1 / +1 lines)
153	"__MEMCACHED_SERVERS__" => "",	153	"__MEMCACHED_SERVERS__" => "",
154	"__MEMCACHED_NAMESPACE__" => "",	154	"__MEMCACHED_NAMESPACE__" => "",
155	"__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu",	155	"__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu",
		156	"__TEMPLATE_CACHE_DIR__" => "/tmp/koha"
156	);	157	);
157		158
158	# Override configuration from the environment	159	# Override configuration from the environment
159	-

Return to bug 17951

Lines 101-106 Makefile.PL - Koha packager and installer Link Here

(-)a/Makefile.PL (-1 / +10 lines)
101	--font_dir Location of fonts (e.g. /usr/share/fonts/truetype/ttf-dejavu)	101	--font_dir Location of fonts (e.g. /usr/share/fonts/truetype/ttf-dejavu)
102	--run_database_tests Run database dependent tests (yes, no)	102	--run_database_tests Run database dependent tests (yes, no)
103	--install_base Base directory of installation (e.g. /usr/share/koha)	103	--install_base Base directory of installation (e.g. /usr/share/koha)
		104	--template-cache-dir Specify a template cache directory (e.g. /var/cache/koha)
104	--help Display this help message	105	--help Display this help message
105		106
106	=head1 DESCRIPTION	107	=head1 DESCRIPTION
Lines 483-488 my %config_defaults = ( Link Here
483	'USE_MEMCACHED' => 'no',	484	'USE_MEMCACHED' => 'no',
484	'MEMCACHED_SERVERS' => '127.0.0.1:11211',	485	'MEMCACHED_SERVERS' => '127.0.0.1:11211',
485	'MEMCACHED_NAMESPACE' => 'KOHA',	486	'MEMCACHED_NAMESPACE' => 'KOHA',
		487	'TEMPLATE_CACHE_DIR' => '/tmp/koha',
486	'FONT_DIR' => '/usr/share/fonts/truetype/ttf-dejavu'	488	'FONT_DIR' => '/usr/share/fonts/truetype/ttf-dejavu'
487	);	489	);
488		490
Lines 544-549 my $cli_koha_use_memcached = ""; Link Here
544	my $cli_koha_font_dir = "";	546	my $cli_koha_font_dir = "";
545	my $cli_koha_run_database_tests = "";	547	my $cli_koha_run_database_tests = "";
546	my $cli_koha_install_base = "";	548	my $cli_koha_install_base = "";
		549	my $cli_koha_template_cache_dir = "";
547	Getopt::Long::Configure('pass_through');	550	Getopt::Long::Configure('pass_through');
548	my $results = GetOptions(	551	my $results = GetOptions(
549	"prev-install-log=s" => \$koha_install_log,	552	"prev-install-log=s" => \$koha_install_log,
Lines 572-577 my $results = GetOptions( Link Here
572	"font_dir=s" => \$cli_koha_font_dir,	575	"font_dir=s" => \$cli_koha_font_dir,
573	"run_database_tests=s" => \$cli_koha_run_database_tests,	576	"run_database_tests=s" => \$cli_koha_run_database_tests,
574	"install_base=s" => \$cli_koha_install_base,	577	"install_base=s" => \$cli_koha_install_base,
		578	"template-cache-dir=s" => \$cli_koha_template_cache_dir,
575	"help" => sub { HelpMessage(0) },	579	"help" => sub { HelpMessage(0) },
576	) or HelpMessage(1);	580	) or HelpMessage(1);
577		581
Lines 859-865 sub get_cli_values { Link Here
859	USE_MEMCACHED => $cli_koha_use_memcached,	863	USE_MEMCACHED => $cli_koha_use_memcached,
860	FONT_DIR => $cli_koha_font_dir,	864	FONT_DIR => $cli_koha_font_dir,
861	RUN_DATABASE_TESTS => $cli_koha_run_database_tests,	865	RUN_DATABASE_TESTS => $cli_koha_run_database_tests,
862	INSTALL_BASE => $cli_koha_install_base	866	INSTALL_BASE => $cli_koha_install_base,
		867	TEMPLATE_CACHE_DIR => $cli_koha_template_cache_dir
863	};	868	};
864	foreach my $key (keys %{$map}) {	869	foreach my $key (keys %{$map}) {
865	$values->{$key} = $map->{$key} if ($map->{$key});	870	$values->{$key} = $map->{$key} if ($map->{$key});
Lines 1240-1245 Memcached namespace?); Link Here
1240	}	1245	}
1241		1246
1242	$msg = q(	1247	$msg = q(
		1248	Template cache directory?);
		1249	$config{'TEMPLATE_CACHE_DIR'} = _get_value('TEMPLATE_CACHE_DIR', $msg, $defaults->{'TEMPLATE_CACHE_DIR'}, $valid_values, $install_log_values);
		1250
		1251	$msg = q(
1243	Path to DejaVu fonts?);	1252	Path to DejaVu fonts?);
1244	$config{'FONT_DIR'} = _get_value('FONT_DIR', $msg, $defaults->{'FONT_DIR'}, $valid_values, $install_log_values);	1253	$config{'FONT_DIR'} = _get_value('FONT_DIR', $msg, $defaults->{'FONT_DIR'}, $valid_values, $install_log_values);
1245		1254