From 9ff15e63ba7df5ed0c0b55dfb0047ff8cc6b57cc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 24 Jun 2020 16:45:12 +0200 Subject: [PATCH] Bug 24151: Rename the config key with 'bcrypt_settings' --- Koha/PseudonymizedTransaction.pm | 8 ++++---- about.pl | 6 +++--- debian/scripts/koha-create | 4 ++-- debian/templates/koha-conf-site.xml.in | 4 ++-- etc/koha-conf.xml | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 8 ++++---- t/db_dependent/Koha/Pseudonymization.t | 10 +++++----- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Koha/PseudonymizedTransaction.pm b/Koha/PseudonymizedTransaction.pm index 4af91169ad..78a1190f7c 100644 --- a/Koha/PseudonymizedTransaction.pm +++ b/Koha/PseudonymizedTransaction.pm @@ -103,18 +103,18 @@ sub new_from_statistic { =head3 get_hash Generates a hashed value for $s (e.g. borrowernumber) with Bcrypt. - Needs config entry 'key' in koha-conf. + Needs config entry 'bcrypt_settings' in koha-conf. =cut sub get_hash { my ( $class, $s ) = @_; - my $key = C4::Context->config('key'); + my $bcrypt_settings = C4::Context->config('bcrypt_settings'); Koha::Exceptions::Config::MissingEntry->throw( - "Missing 'key' entry in config file") unless $key; + "Missing 'bcrypt_settings' entry in config file") unless $bcrypt_settings; - return bcrypt($s, $key); + return bcrypt($s, $bcrypt_settings); } =head2 Internal methods diff --git a/about.pl b/about.pl index de0a6c5fa4..d624246d6b 100755 --- a/about.pl +++ b/about.pl @@ -519,10 +519,10 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs; } { - # Test 'key' config for Pseudonymization - $template->param( config_key_no_set => 1 ) + # Test 'bcrypt_settings' config for Pseudonymization + $template->param( config_bcrypt_settings_no_set => 1 ) if C4::Context->preference('Pseudonymization') - and not C4::Context->config('key'); + and not C4::Context->config('bcrypt_settings'); } my %versions = C4::Context::get_versions(); diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 5cc3f2ffc4..390879f37f 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -111,7 +111,7 @@ generate_config_file() { -e "s/__UNIXGROUP__/$username/g" \ -e "s#__TEMPLATE_CACHE_DIR__#$TEMPLATE_CACHE_DIR#g" \ -e "s#__TIMEZONE__#$TIMEZONE#g" \ - -e "s#__KEY__#$KEY#g" \ + -e "s#__BCRYPT_SETTINGS__#$BCRYPT_SETTINGS#g" \ -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \ -e "s#__TMP_PATH__#$TMP_PATH#g" \ -e "s/__LOG_DIR__/\/var\/log\/koha\/$name/g" \ @@ -496,7 +496,7 @@ if [ "${CLO_ELASTICSEARCH_SERVER}" != "" ]; then ELASTICSEARCH_SERVER="${CLO_ELASTICSEARCH_SERVER}" fi -KEY=$(htpasswd -bnBC 10 "" password | tr -d ':\n' | sed 's/$2y/$2a/'); +BCRYPT_SETTINGS=$(htpasswd -bnBC 10 "" password | tr -d ':\n' | sed 's/$2y/$2a/'); if [ "$ENABLE_SRU" != "no" ]; then diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in index 099a65b5bf..4853018b1f 100644 --- a/debian/templates/koha-conf-site.xml.in +++ b/debian/templates/koha-conf-site.xml.in @@ -403,8 +403,8 @@ __END_SRU_PUBLICSERVER__ server. e.g. Antarctica/South_Pole --> __TIMEZONE__ - - __KEY__ + + __BCRYPT_SETTINGS__ - - __KEY__ + + __BCRYPT_SETTINGS__