View | Details | Raw Unified | Return to bug 28998
Collapse All | Expand All

(-)a/debian/templates/koha-conf-site.xml.in (+3 lines)
Lines 397-402 __END_SRU_PUBLICSERVER__ Link Here
397
 <!-- This is the bcrypt settings used to generated anonymized content -->
397
 <!-- This is the bcrypt settings used to generated anonymized content -->
398
 <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
398
 <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
399
399
400
 <!-- Encryption key for crypted password or sensitive data -->
401
 <encryption_key>__ENCRYPTION_KEY__</encryption_key>
402
400
 <!-- flag for development purposes
403
 <!-- flag for development purposes
401
      dev_install is used to adjust some paths specific to dev installations
404
      dev_install is used to adjust some paths specific to dev installations
402
      strict_sql_modes should not be used in a production environment
405
      strict_sql_modes should not be used in a production environment
(-)a/etc/koha-conf.xml (-1 / +4 lines)
Lines 211-219 Link Here
211
      server. e.g. Antarctica/South_Pole -->
211
      server. e.g. Antarctica/South_Pole -->
212
 <timezone></timezone>
212
 <timezone></timezone>
213
213
214
 <!-- This is the bcryt settings used to generated anonymized content -->
214
 <!-- This is the bcrypt settings used to generated anonymized content -->
215
 <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
215
 <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
216
216
217
 <!-- Encryption key for crypted password or sensitive data -->
218
 <encryption_key>__ENCRYPTION_KEY__</encryption_key>
219
217
 <!-- flag for development purposes
220
 <!-- flag for development purposes
218
      dev_install is used to adjust some paths specific to dev installations
221
      dev_install is used to adjust some paths specific to dev installations
219
      strict_sql_modes should not be used in a production environment
222
      strict_sql_modes should not be used in a production environment
(-)a/t/Koha/Config.t (+1 lines)
Lines 218-223 subtest 'read_from_file() tests' => sub { Link Here
218
            },
218
            },
219
            'timezone' => '',
219
            'timezone' => '',
220
            'bcrypt_settings' => '__BCRYPT_SETTINGS__',
220
            'bcrypt_settings' => '__BCRYPT_SETTINGS__',
221
            'encryption_key' => '__ENCRYPTION_KEY__',
221
            'dev_install' => '0',
222
            'dev_install' => '0',
222
            'strict_sql_modes' => '0',
223
            'strict_sql_modes' => '0',
223
            'plugin_repos' => '',
224
            'plugin_repos' => '',
(-)a/t/data/koha-conf.xml (-2 / +4 lines)
Lines 216-224 Link Here
216
      server. e.g. Antarctica/South_Pole -->
216
      server. e.g. Antarctica/South_Pole -->
217
 <timezone></timezone>
217
 <timezone></timezone>
218
218
219
 <!-- This is the bcryt settings used to generated anonymized content -->
219
 <!-- This is the bcrypt settings used to generated anonymized content -->
220
 <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
220
 <bcrypt_settings>__BCRYPT_SETTINGS__</bcrypt_settings>
221
221
222
 <!-- Encryption key for crypted password or sensitive data -->
223
 <encryption_key>__ENCRYPTION_KEY__</encryption_key>
224
222
 <!-- flag for development purposes
225
 <!-- flag for development purposes
223
      dev_install is used to adjust some paths specific to dev installations
226
      dev_install is used to adjust some paths specific to dev installations
224
      strict_sql_modes should not be used in a production environment
227
      strict_sql_modes should not be used in a production environment
225
- 

Return to bug 28998