From bb8c7ebb6a117b93b1f0f1420df8800e3aa9e4f5 Mon Sep 17 00:00:00 2001 From: Kayou Date: Fri, 22 May 2020 12:32:49 +0200 Subject: [PATCH] Do not create a new password if the user already exists --- data/helpers.d/postgresql | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/data/helpers.d/postgresql b/data/helpers.d/postgresql index 78ef4f7ce..0b027c78f 100644 --- a/data/helpers.d/postgresql +++ b/data/helpers.d/postgresql @@ -229,12 +229,14 @@ ynh_psql_setup_db() { # Manage arguments with getopts ynh_handle_getopts_args "$@" - local new_db_pwd=$(ynh_string_random) # Generate a random password - # If $db_pwd is not given, use new_db_pwd instead for db_pwd - db_pwd="${db_pwd:-$new_db_pwd}" - if ! ynh_psql_user_exists --user=$db_user; then + local new_db_pwd=$(ynh_string_random) # Generate a random password + # If $db_pwd is not given, use new_db_pwd instead for db_pwd + db_pwd="${db_pwd:-$new_db_pwd}" + ynh_psql_create_user "$db_user" "$db_pwd" + elif [ -z $db_pwd ]; then + ynh_die --message="The user $db_user exists, please provide his password" fi ynh_psql_create_db "$db_name" "$db_user" # Create the database