From 61697b27494d2c718d791c106c9200b33f9bb8a6 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 3 Jun 2021 14:32:12 +0200
Subject: [PATCH] Fix

---
 scripts/change_url |  2 +-
 scripts/install    | 12 +++++-------
 scripts/upgrade    |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index b163620..ae8cf8a 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 # Add settings here as needed by your application
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 unicorn_workers=$(ynh_app_setting_get --app=$app --key=unicorn_workers)
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index 9c94653..8759442 100644
--- a/scripts/install
+++ b/scripts/install
@@ -63,7 +63,7 @@ ynh_app_setting_set --app=$app --key=email --value=$email
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
@@ -72,7 +72,7 @@ ynh_script_progression --message="Creating a PostgreSQL database..."
 
 db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
-db_pwd=$(ynh_string_random)
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd
 ynh_psql_test_if_first_run
@@ -159,10 +159,8 @@ echo "svgo: false" > $final_path/.image_optim.yml
 ynh_script_progression --message="Setting up Unicorn..."
 
 # Set a secret value
-cp ../conf/secrets.yml "$final_path/config/secrets.yml"
-ynh_replace_string --match_string="__SECRET__" --replace_string="$(ynh_string_random)" --target_file="$final_path/config/secrets.yml"
-# Calculate and store the config file checksum
-ynh_store_file_checksum --file="$final_path/config/secrets.yml"
+secret=$(ynh_string_random)
+ynh_add_config --template="../conf/secrets.yml" --destination="$final_path/config/secrets.yml"
 
 # Set permissions to app files
 chown -R $app: $final_path
@@ -334,7 +332,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..."
+ynh_script_progression --message="Reloading NGINX web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index fe24ed3..fd92a58 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -21,13 +21,13 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)
 unicorn_workers=$(ynh_app_setting_get --app=$app --key=unicorn_workers)
 email=$(ynh_app_setting_get --app=$app --key=email)
 
 # Check memory requirements
-check_memory_requirements_upgrade
+#check_memory_requirements_upgrade
 
 #=================================================
 # CHECK VERSION