installer: added install log

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/Makefile.PL b/Makefile.PL
index 9a71219..9fb7d64 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -251,6 +251,7 @@ my $target_map = {
   './misc/bin'                  => { target => 'SCRIPT_DIR', trimdir => -1 }, 
   './misc/release_notes'        => { target => 'DOC_DIR', trimdir => 2 },
   './misc/translator'           => { target => 'MISC_DIR', trimdir => 2 }, 
+  './misc/koha-install-log'     => { target => 'MISC_DIR', trimdir => -1 },
   './misc/installer_devel_notes' => 'NONE',
   './opac'                      => 'OPAC_CGI_DIR',
   './README.txt'                => 'NONE',
@@ -436,7 +437,8 @@ get_file_map($target_map, $dirtree, $file_map, $config{'INSTALL_ZEBRA'} eq "yes"
 my $pl_files = {
       'rewrite-config.PL' => [
          'blib/KOHA_CONF_DIR/koha-conf.xml',
-         'blib/KOHA_CONF_DIR/koha-httpd.conf'
+         'blib/KOHA_CONF_DIR/koha-httpd.conf',
+         'blib/MISC_DIR/koha-install-log'
          ],
          'fix-perl-path.PL' => [       # this script ensures the correct shebang line for the platform installed on...
                 'blib'
@@ -981,6 +983,15 @@ PazPar2 port?);
     }
 
     print "\n\n";
+
+    # add version number
+    my $version = "no_version_found";
+    eval {
+        require 'kohaversion.pl';
+        $version = kohaversion();
+    };
+    $config{'KOHA_INSTALLED_VERSION'} = $version;
+
     return %config;
 }
 

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 1c554e9..f24d7df 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -187,5 +187,6 @@
  <includes>__INTRANET_TMPL_DIR__/prog/en/includes/</includes>
  <logdir>__LOG_DIR__</logdir>
  <pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url>
+ <install_log>__MISC_DIR__/koha-install-log</install_log>
 </config>
 </yazgfs>

diff --git a/misc/koha-install-log b/misc/koha-install-log
new file mode 100644 (file)
index 0000000..1d964a2
--- /dev/null
+++ b/misc/koha-install-log
@@ -0,0 +1,51 @@
+# This file contains settings used
+# during the installation of Koha.
+# It is meant for use during future
+# upgrades of Koha, and should not
+# be edited.
+KOHA_INSTALLED_VERSION=__KOHA_INSTALLED_VERSION__ 
+LOG_DIR=__LOG_DIR__
+DB_TYPE=__DB_TYPE__
+DB_NAME=__DB_NAME__
+DB_HOST=__DB_HOST__
+DB_PORT=__DB_PORT__
+DB_USER=__DB_USER__
+DB_PASS=__DB_PASS__
+WEBMASTER_EMAIL=__WEBMASTER_EMAIL__
+WEBSERVER_DOMAIN=__WEBSERVER_DOMAIN__
+WEBSERVER_HOST=__WEBSERVER_HOST__
+WEBSERVER_IP=__WEBSERVER_IP__
+WEBSERVER_PORT=__WEBSERVER_PORT__
+WEBSERVER_PORT_LIBRARIAN=__WEBSERVER_PORT_LIBRARIAN__
+ZEBRA_SRU_HOST=__ZEBRA_SRU_HOST__
+ZEBRA_SRU_BIBLIOS_PORT=__ZEBRA_SRU_BIBLIOS_PORT__
+ZEBRA_SRU_AUTHORITIES_PORT=__ZEBRA_SRU_AUTHORITIES_PORT__
+KOHA_USER=__KOHA_USER__
+KOHA_GROUP=__KOHA_GROUP__
+ZEBRA_PASS=__ZEBRA_PASS__
+ZEBRA_USER=__ZEBRA_USER__
+INTRANET_CGI_DIR=__INTRANET_CGI_DIR__
+INTRANET_TMPL_DIR=__INTRANET_TMPL_DIR__
+INTRANET_WWW_DIR=__INTRANET_WWW_DIR__
+OPAC_CGI_DIR=__OPAC_CGI_DIR__
+OPAC_TMPL_DIR=__OPAC_TMPL_DIR__
+OPAC_WWW_DIR=__OPAC_WWW_DIR__
+PERL_MODULE_DIR=__PERL_MODULE_DIR__
+KOHA_CONF_DIR=__KOHA_CONF_DIR__
+ZEBRA_CONF_DIR=__ZEBRA_CONF_DIR__
+PAZPAR2_CONF_DIR=__PAZPAR2_CONF_DIR__
+MISC_DIR=__MISC_DIR__
+SCRIPT_DIR=__SCRIPT_DIR__
+MAN_DIR=__MAN_DIR__
+DOC_DIR=__DOC_DIR__
+ZEBRA_LOCK_DIR=__ZEBRA_LOCK_DIR__
+ZEBRA_DATA_DIR=__ZEBRA_DATA_DIR__
+ZEBRA_RUN_DIR=__ZEBRA_RUN_DIR__
+ZEBRA_MARC_FORMAT=__ZEBRA_MARC_FORMAT__
+ZEBRA_LANGUAGE=__ZEBRA_LANGUAGE__
+ZEBRA_AUTH_CFG=__ZEBRA_AUTH_CFG__
+AUTH_RETRIEVAL_CFG=__AUTH_RETRIEVAL_CFG__
+MERGE_SERVER_HOST=__MERGE_SERVER_HOST__
+MERGE_SERVER_PORT=__MERGE_SERVER_PORT__
+PAZPAR2_HOST=__PAZPAR2_HOST__
+PAZPAR2_PORT=__PAZPAR2_PORT__

diff --git a/rewrite-config.PL b/rewrite-config.PL
index 82524af..6f084a5 100644 (file)
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -71,6 +71,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
 # Keys were extracted by
 # <grep -o '__.*__' etc/* | cut -f2 -d: | sort -u | sed -e 's/^/  "/;s/$/" => "",/'
 %configuration = (
+  "__KOHA_INSTALLED_VERSION__" => "no_version_found",
   "__LOG_DIR__" => "/var/log",
   "__DB_TYPE__" => "mysql",
   "__DB_NAME__" => "koha",