romain-dartigues/cdist-contrib
1
0
Fork 0
forked from ungleich-public/cdist-contrib
Code Pull requests Activity

__nextcloud: stricter check configuration values

Browse source 
This now checks the configuration value exactly and does not say there
are equal if just the end of the string differs.

Resulting from this, it will run code the next run if the default port
was in a database migration. This was fixed by instantly correct this
configuration value.
This commit is contained in:
matze 2020-10-26 19:19:49 +01:00
parent b368102bd5
commit 072ca37720
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
type/__nextcloud/map-conf-changes.sh
View file

@ -35,7 +35,7 @@ testparam() {
# short-circuit after installation; the explorer may not be valid # short-circuit after installation; the explorer may not be valid
if [ "$install" ]; then return 1; fi if [ "$install" ]; then return 1; fi
if grep -q -F "$1 = $2" "$__object/explorer/config"; then if grep -q -Fx "$1 = $2" "$__object/explorer/config"; then
return 0 return 0
else else
return 1 return 1
@ -113,7 +113,6 @@ conf_decimal() {
# Arguments: # Arguments:
# 1: cdist type parameter name # 1: cdist type parameter name
# 2: nextcloud config name # 2: nextcloud config name
# FIXME default value required for booleans?
conf_boolean() { conf_boolean() {
# map parameter to a php boolean (are outputted as 0 or 1) # map parameter to a php boolean (are outputted as 0 or 1)
if [ -f "$__object/parameter/$1" ]; then if [ -f "$__object/parameter/$1" ]; then
@ -239,6 +238,10 @@ migrate_db() {
database_port=5432 database_port=5432
;; ;;
esac esac
# Correct this value to the value set by the parameter
# this will prevent codegen in the run after the migration
correct_standard_port="yes"
fi fi
# print out the correct command # print out the correct command
@ -246,6 +249,11 @@ migrate_db() {
'%s' '%s' --password '%s' '%s' --port '%u' '%s'\n" \ '%s' '%s' --password '%s' '%s' --port '%u' '%s'\n" \
"$database_type" "$database_user" "$database_pass" "$database_host" "$database_port" "$database_name" "$database_type" "$database_user" "$database_pass" "$database_host" "$database_port" "$database_name"
printf "php occ maintenance:mode --on\n" # was disabled by database convertion printf "php occ maintenance:mode --on\n" # was disabled by database convertion
# Correct the database host value if it was not correctly set by the migration script
if [ "$correct_standard_port" = "yes" ]; then
printf "php occ config:system:set '%s' --type=string --value '%s'\n" "dbhost" "$database_host"
fi
} }