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

(-)a/Makefile.PL (-1 / +10 lines)
Lines 101-106 Makefile.PL - Koha packager and installer Link Here
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 484-489 my %config_defaults = ( Link Here
484
  'USE_MEMCACHED'     => 'no',
485
  'USE_MEMCACHED'     => 'no',
485
  'MEMCACHED_SERVERS' => '127.0.0.1:11211',
486
  'MEMCACHED_SERVERS' => '127.0.0.1:11211',
486
  'MEMCACHED_NAMESPACE' => 'KOHA',
487
  'MEMCACHED_NAMESPACE' => 'KOHA',
488
  'TEMPLATE_CACHE_DIR' => '/tmp/koha',
487
  'FONT_DIR'          => '/usr/share/fonts/truetype/ttf-dejavu'
489
  'FONT_DIR'          => '/usr/share/fonts/truetype/ttf-dejavu'
488
);
490
);
489
491
Lines 545-550 my $cli_koha_use_memcached = ""; Link Here
545
my $cli_koha_font_dir = "";
547
my $cli_koha_font_dir = "";
546
my $cli_koha_run_database_tests = "";
548
my $cli_koha_run_database_tests = "";
547
my $cli_koha_install_base = "";
549
my $cli_koha_install_base = "";
550
my $cli_koha_template_cache_dir = "";
548
Getopt::Long::Configure('pass_through');
551
Getopt::Long::Configure('pass_through');
549
my $results = GetOptions(
552
my $results = GetOptions(
550
    "prev-install-log=s"           => \$koha_install_log,
553
    "prev-install-log=s"           => \$koha_install_log,
Lines 573-578 my $results = GetOptions( Link Here
573
    "font_dir=s"                   => \$cli_koha_font_dir,
576
    "font_dir=s"                   => \$cli_koha_font_dir,
574
    "run_database_tests=s"         => \$cli_koha_run_database_tests,
577
    "run_database_tests=s"         => \$cli_koha_run_database_tests,
575
    "install_base=s"               => \$cli_koha_install_base,
578
    "install_base=s"               => \$cli_koha_install_base,
579
    "template-cache-dir=s"         => \$cli_koha_template_cache_dir,
576
    "help"                         => sub { HelpMessage(0) },
580
    "help"                         => sub { HelpMessage(0) },
577
) or HelpMessage(1);
581
) or HelpMessage(1);
578
582
Lines 860-866 sub get_cli_values { Link Here
860
        USE_MEMCACHED              => $cli_koha_use_memcached,
864
        USE_MEMCACHED              => $cli_koha_use_memcached,
861
        FONT_DIR                   => $cli_koha_font_dir,
865
        FONT_DIR                   => $cli_koha_font_dir,
862
        RUN_DATABASE_TESTS         => $cli_koha_run_database_tests,
866
        RUN_DATABASE_TESTS         => $cli_koha_run_database_tests,
863
        INSTALL_BASE               => $cli_koha_install_base
867
        INSTALL_BASE               => $cli_koha_install_base,
868
        TEMPLATE_CACHE_DIR         => $cli_koha_template_cache_dir
864
    };
869
    };
865
    foreach my $key (keys %{$map}) {
870
    foreach my $key (keys %{$map}) {
866
        $values->{$key} = $map->{$key} if ($map->{$key});
871
        $values->{$key} = $map->{$key} if ($map->{$key});
Lines 1241-1246 Memcached namespace?); Link Here
1241
  }
1246
  }
1242
1247
1243
  $msg = q(
1248
  $msg = q(
1249
Template cache directory?);
1250
  $config{'TEMPLATE_CACHE_DIR'} = _get_value('TEMPLATE_CACHE_DIR', $msg, $defaults->{'TEMPLATE_CACHE_DIR'}, $valid_values, $install_log_values);
1251
1252
  $msg = q(
1244
Path to DejaVu fonts?);
1253
Path to DejaVu fonts?);
1245
  $config{'FONT_DIR'} = _get_value('FONT_DIR', $msg, $defaults->{'FONT_DIR'}, $valid_values, $install_log_values);
1254
  $config{'FONT_DIR'} = _get_value('FONT_DIR', $msg, $defaults->{'FONT_DIR'}, $valid_values, $install_log_values);
1246
1255
(-)a/etc/koha-conf.xml (-4 / +1 lines)
Lines 122-131 __PAZPAR2_TOGGLE_XML_POST__ Link Here
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>
(-)a/rewrite-config.PL (-1 / +1 lines)
Lines 153-158 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
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