From b5d6ab14447b4c8e1c9c5e873f64cb2140a0a3ec Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Mon, 10 Dec 2018 15:47:51 +0100 Subject: [PATCH] new: [odoo-tecnativa] do not require admin password and generate random password if not any. --- .../hooks/postgres_database-relation-joined | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/odoo-tecnativa/hooks/postgres_database-relation-joined b/odoo-tecnativa/hooks/postgres_database-relation-joined index 80cf6cb..3533ec9 100755 --- a/odoo-tecnativa/hooks/postgres_database-relation-joined +++ b/odoo-tecnativa/hooks/postgres_database-relation-joined @@ -12,7 +12,17 @@ set -e PASSWORD="$(relation-get password)" USER="$(relation-get user)" DBNAME="$(relation-get dbname)" -ADMIN_PASSWORD=$(relation-base-compose-get admin-password) +ADMIN_PASSWORD=$(relation-base-compose-get admin-password 2>/dev/null) || { + if [ -e "$CONFIG" ]; then + ADMIN_PASSWORD=$(grep ^admin_passwd "$CONFIG" | sed -r 's/^admin_passwd\s+=\s+(.+)$/\1/g') + fi + if [ -z "$ADMIN_PASSWORD" ]; then + info "Generating odoo admin password" + ADMIN_PASSWORD=$(gen_password) + fi +} + + control=$(echo -en "$USER\0$DBNAME\0$PASSWORD\0$ADMIN_PASSWORD" | md5_compat)