Bug 10942: (follow-up) create a /etc/koha/koha-common.conf

This patch creates a new master configuration file for the
koha-common package, and moves the AUTOMATIC_TRANSLATIONS_UPDATE
variable rather than leaving in in /etc/default/koha, which is meant
to be used for init script settings.

The configuration format is simple - a shell script that
sets variables and which can sourced by another script or
trivially parsed.

To test:

- Apply the patch series for bug 10942 and build a package.
- Install the package.
- Verify that a new config file, /etc/koha/koha-common.conf.
- Follow the rest of the test plan for the main page (e.g.,
  set AUTOMATIC_TRANSLATIONS_UPDATE and force a package upgrade).

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/debian/koha-common.default b/debian/koha-common.default
index cbc6eba..2f4dc40 100644 (file)
--- a/debian/koha-common.default
+++ b/debian/koha-common.default
@@ -2,15 +2,4 @@
 
 PERL5LIB="/usr/share/koha/lib"
 
-## Automatic template translation update
-#
-# This variable controls whether template translations should
-# be updated automatically on koha-common package upgrades.
-# Options: 'yes'
-#          'no'  (default)
-# Note: if you choose 'no' then you will have to issue
-#  $ koha-translate --update <lang_code>
-#
-#AUTOMATIC_TRANSLATIONS_UPDATE="no"
-
 ## End of general koha-common default options

diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst
index b76cf57..f56142d 100644 (file)
--- a/debian/koha-common.postinst
+++ b/debian/koha-common.postinst
@@ -2,15 +2,14 @@
 
 set -e
 
-NAME="koha-common"
 # Default to "no"
 AUTOMATIC_TRANSLATIONS_UPDATE="no"
 
 . /usr/share/debconf/confmodule
 
 # Read configuration variable file if it is present
-if [ -r /etc/default/$NAME ]; then
-    . /etc/default/$NAME
+if [ -r /etc/koha/koha-common.conf ]; then
+    . /etc/koha/koha-common.conf
 fi
 
 conf=/etc/mysql/koha-common.cnf

diff --git a/debian/templates/koha-common.conf b/debian/templates/koha-common.conf
new file mode 100644 (file)
index 0000000..3c8a9af
--- /dev/null
+++ b/debian/templates/koha-common.conf
@@ -0,0 +1,17 @@
+### Configuration settings for all Koha sites
+#
+# This file contains configuration settings that apply
+# to all Koha sites on this server or which apply to
+# the koha-common package itself.
+#
+
+## Automatic template translation update
+#
+# This variable controls whether template translations should
+# be updated automatically on koha-common package upgrades.
+# Options: 'yes'
+#          'no' (default)
+# Note: if you choose 'no' then you will have to issue
+#  $ koha-translate --update <lang_code>
+#
+#AUTOMATIC_TRANSLATIONS_UPDATE="no"