Bug 32336: (QA follow-up) Use $metadata->schema

[srvgit] / rewrite-config.PL

diff --git a/rewrite-config.PL b/rewrite-config.PL
index 8479e12..b0ecb8f 100644 (file)
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -121,7 +121,6 @@ my %configuration = (
   '__PERL_MODULE_DIR__' =>  ($ENV{'INSTALLSITELIB'} || sprintf($prefix."/lib/perl5/site_perl/%vd",$^V))."/koha",
   '__KOHA_CONF_DIR__' => "$prefix/etc/koha",
   '__ZEBRA_CONF_DIR__' => "$prefix/etc/koha/zebradb",
-  '__PAZPAR2_CONF_DIR__' => "$prefix/etc/koha/pazpar2",
   '__MISC_DIR__' => "$prefix/misc",
   '__SCRIPT_DIR__' => "$prefix/bin",
   '__SCRIPT_NONDEV_DIR__' => "$prefix/bin",
@@ -140,15 +139,9 @@ my %configuration = (
   '__ZEBRA_AUTH_CFG__' => 'zebra-authorities-dom.cfg',
   '__ZEBRA_BIB_CFG__' => 'zebra-biblios-dom.cfg',
   "__MERGE_SERVER_HOST__" => $myhost,
-  "__MERGE_SERVER_PORT__" => '11001',
-  "__PAZPAR2_HOST__" => $myhost,
-  "__PAZPAR2_PORT__" => '11002',
   "__INSTALL_MODE__" => 'standard',
   "__INSTALL_BASE__" => '/usr/share/koha',
   "__INSTALL_SRU__" => 'yes',
-  "__INSTALL_PAZPAR2__" => 'no',
-  "__PAZPAR2_TOGGLE_XML_PRE__" => '<!--',
-  "__PAZPAR2_TOGGLE_XML_POST__" => '-->',
   "__RUN_DATABASE_TESTS__" => 'no',
   "__PATH_TO_ZEBRA__" => "",
   "__USE_MEMCACHED__" => 'yes',
@@ -158,7 +151,16 @@ my %configuration = (
   "__ELASTICSEARCH_SERVERS__" => "localhost:9200",
   "__ELASTICSEARCH_INDEX__" => "koha",
   "__FONT_DIR__" => "/usr/share/fonts/truetype/dejavu",
-  "__TEMPLATE_CACHE_DIR__" => "/tmp/koha"
+  "__TEMPLATE_CACHE_DIR__" => "/tmp/koha",
+  '__SMTP_HOST__'      => 'localhost',
+  '__SMTP_PORT__'      => '25',
+  '__SMTP_TIMEOUT__'   => '120',
+  '__SMTP_SSL_MODE__'  => 'disabled',
+  '__SMTP_USER_NAME__' => '',
+  '__SMTP_PASSWORD__'  => '',
+  '__SMTP_DEBUG__'     => '0',
+  '__PERL_MODULE_LIB_DIR__'  => "$prefix/lib",
+  '__PERL5LIB_DIRS__'  => "$prefix/lib",
 );
 
 # Override configuration from the environment
@@ -168,13 +170,6 @@ foreach my $key (keys %configuration) {
   }
 }
 
-# munge commenting out the PazPar2 mergeserver
-# entry in koha-conf.xml if necessary
-if ($configuration{'__INSTALL_PAZPAR2__'} eq 'yes') {
-    $configuration{'__PAZPAR2_TOGGLE_XML_PRE__'} = '';
-    $configuration{'__PAZPAR2_TOGGLE_XML_POST__'} = '';
-}
-
 my $fname = $ARGV[0];
 my $file = &read_file($fname);
 $file =~ s/__.*?__/exists $configuration{$&} ? $configuration{$&} : $&/seg;