kjg/cdist-contrib
1
0
Fork 0
forked from ungleich-public/cdist-contrib
Code Issues Pull requests Projects Releases Wiki Activity

__nextcloud: aborts at installation with pgsql/mariadb

Browse source 
Accidentally, there was a check for a parameter that could not exist.
The block is now streamlined as other parameters got handled, too :-)
This commit is contained in:
matze 2020-11-15 16:34:26 +01:00
parent c24aedd4db
commit 32417aba34
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
type/__nextcloud/gencode-remote
View file

@ -122,17 +122,9 @@ if ! grep -q -F "installed = 1" "$__object/explorer/config"; then
}
# Database setup for mysql and pgsql
db_setup() {
if ! [ -f "$__object/parameter/db-host" ]; then
echo "no hostname given! can't proceed." >&2
exit 3
fi
# add type and other database values
occ_install_args="$occ_install_args --database '$1'"
db_host="$__object/parameter/database-host"
if [ -f "$db_host" ]; then
occ_install_args="$occ_install_args --database-host '$(cat "$db_host")'"
fi
occ_install_args="$occ_install_args --database-host '$(cat "$__object/parameter/database-host" || die_err)'"
occ_install_args="$occ_install_args --database-name '$(cat "$__object/parameter/database-name" || die_err)'"
occ_install_args="$occ_install_args --database-user '$(cat "$__object/parameter/database-user" || die_err)'"
occ_install_args="$occ_install_args --database-pass '$(cat "$__object/parameter/database-password" || die_err)'"