From b065a956d33f7a98ca724864bc51e553e53dc60b Mon Sep 17 00:00:00 2001 From: navanchauhan Date: Tue, 9 Aug 2022 16:40:16 -0400 Subject: [PATCH] fixed psql pwd --- scripts/restore | 2 +- scripts/upgrade | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/restore b/scripts/restore index c60e202..5f2ef60 100755 --- a/scripts/restore +++ b/scripts/restore @@ -33,7 +33,7 @@ port=$(ynh_app_setting_get --app=$app --key=port) path_url=$(ynh_app_setting_get --app=$app --key=path) 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) secretkey=$(ynh_app_setting_get --app=$app --key=secretkey) db_user=$db_name diff --git a/scripts/upgrade b/scripts/upgrade index e69daa0..52d3ab8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,7 +21,7 @@ port=$(ynh_app_setting_get --app=$app --key=port) path_url=$(ynh_app_setting_get --app=$app --key=path) 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) secretkey=$(ynh_app_setting_get --app=$app --key=secretkey) #================================================= @@ -135,11 +135,10 @@ chown $app:$app "$final_path/.env" if [ "$upgrade_type" == "UPGRADE_APP" ] then - # load environment variables - export $(cat "/var/www/$app/.env" |grep "^[^#]" | xargs) - ynh_script_progression --message="Running migrations and generatic static files..." --weight=2 pushd "$final_path" + # load environment variables + export $(cat "/var/www/$app/.env" |grep "^[^#]" | xargs) ynh_exec_as $app "$final_path/venv/bin/python3" manage.py migrate ynh_exec_as $app "$final_path/venv/bin/python3" manage.py collectstatic --no-input ynh_exec_as $app "$final_path/venv/bin/python3" manage.py collectstatic_js_reverse