Bug 28998: Add encryption_key to the config file

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 20d2172..2e66535 100644 (file)
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -397,6 +397,9 @@ __END_SRU_PUBLICSERVER__
  <!-- This is the bcrypt settings used to generated anonymized content -->
  <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
 
+ <!-- Encryption key for crypted password or sensitive data -->
+ <encryption_key>__ENCRYPTION_KEY__</encryption_key>
+
  <!-- flag for development purposes
       dev_install is used to adjust some paths specific to dev installations
       strict_sql_modes should not be used in a production environment

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 2c95e2c..6c2c1fe 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -211,9 +211,12 @@
       server. e.g. Antarctica/South_Pole -->
  <timezone></timezone>
 
- <!-- This is the bcryt settings used to generated anonymized content -->
+ <!-- This is the bcrypt settings used to generated anonymized content -->
  <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
 
+ <!-- Encryption key for crypted password or sensitive data -->
+ <encryption_key>__ENCRYPTION_KEY__</encryption_key>
+
  <!-- flag for development purposes
       dev_install is used to adjust some paths specific to dev installations
       strict_sql_modes should not be used in a production environment

diff --git a/t/Koha/Config.t b/t/Koha/Config.t
index 60df194..dbee152 100755 (executable)
--- a/t/Koha/Config.t
+++ b/t/Koha/Config.t
@@ -218,6 +218,7 @@ subtest 'read_from_file() tests' => sub {
             },
             'timezone' => '',
             'bcrypt_settings' => '__BCRYPT_SETTINGS__',
+            'encryption_key' => '__ENCRYPTION_KEY__',
             'dev_install' => '0',
             'strict_sql_modes' => '0',
             'plugin_repos' => '',

diff --git a/t/data/koha-conf.xml b/t/data/koha-conf.xml
index ae5faf6..5a5d5c3 100644 (file)
--- a/t/data/koha-conf.xml
+++ b/t/data/koha-conf.xml
@@ -216,9 +216,12 @@
       server. e.g. Antarctica/South_Pole -->
  <timezone></timezone>
 
- <!-- This is the bcryt settings used to generated anonymized content -->
+ <!-- This is the bcrypt settings used to generated anonymized content -->
  <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
 
+ <!-- Encryption key for crypted password or sensitive data -->
+ <encryption_key>__ENCRYPTION_KEY__</encryption_key>
+
  <!-- flag for development purposes
       dev_install is used to adjust some paths specific to dev installations
       strict_sql_modes should not be used in a production environment