X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=rewrite-config.PL;h=b0ecb8f80d85649796954f345f42daea2a12860c;hb=d81bca827058e04f656ce0bf95187b7b74b2d5c2;hp=3047f8d2f651398799daf0c626ea09efeea0d884;hpb=b168f4a2e9a03ed56ce857353d4dde940980caba;p=srvgit

diff --git a/rewrite-config.PL b/rewrite-config.PL
index 3047f8d2f6..b0ecb8f80d 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -60,6 +60,8 @@ also need to override WEBSERVER_IP.
 
 =cut
 
+my $myhost;
+my $mydomain;
 if ( $myhost = $ENV{WEBSERVER_HOST} || hostname ) {
     ( $mydomain = $myhost ) =~ s/.*?\.//;
 } else {
@@ -67,6 +69,7 @@ if ( $myhost = $ENV{WEBSERVER_HOST} || hostname ) {
     $mydomain = 'localdomain';
 }
 
+my $myip;
 unless ( $myip = $ENV{WEBSERVER_IP} ) {
     my $byname = gethostbyname( $myhost )
 	or die "Could not get the IP address of $myhost, DNS fault? ($!)";
@@ -75,12 +78,12 @@ unless ( $myip = $ENV{WEBSERVER_IP} ) {
 }
 
 
-$prefix = $ENV{'INSTALL_BASE'} || "/usr";
+my $prefix = $ENV{'INSTALL_BASE'} || "/usr";
 
 # These are our configuration guesses
 # Keys were extracted by
 # <grep -o '__.*__' etc/* | cut -f2 -d: | sort -u | sed -e 's/^/  "/;s/$/" => "",/'
-%configuration = (
+my %configuration = (
   "__KOHA_INSTALLED_VERSION__" => "no_version_found",
   "__LOG_DIR__" => "/var/log",
   "__PLUGINS_DIR__" => "/var/lib/koha/plugins",
@@ -118,7 +121,6 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   '__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",
@@ -137,15 +139,9 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   '__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',
@@ -154,8 +150,17 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   "__USE_ELASTICSEARCH__" => 'no',
   "__ELASTICSEARCH_SERVERS__" => "localhost:9200",
   "__ELASTICSEARCH_INDEX__" => "koha",
-  "__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu",
-  "__TEMPLATE_CACHE_DIR__" => "/tmp/koha"
+  "__FONT_DIR__" => "/usr/share/fonts/truetype/dejavu",
+  "__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
@@ -165,15 +170,8 @@ 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__'} = '';
-}
-
-$fname = $ARGV[0];
-$file = &read_file($fname);
+my $fname = $ARGV[0];
+my $file = &read_file($fname);
 $file =~ s/__.*?__/exists $configuration{$&} ? $configuration{$&} : $&/seg;
 
 # At this point, file is in 'blib' and by default