From 864958888e10640a70ced106302c579242752b9b Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Mon, 15 Aug 2022 17:15:13 +0200 Subject: [PATCH 1/3] log_file="${log_path}/${app}.log" --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index eb4830b..faab65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -34,7 +34,7 @@ default_from_email="${app}@${domain}" public_path=/var/www/$app final_path=/opt/yunohost/$app log_path=/var/log/$app -log_file="${log_path}/django_example_ynh.log" +log_file="${log_path}/${app}.log" #================================================= # COMMON VARIABLES From 78d9ce54205b6d030afd5b36a764f5712d2d764e Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Mon, 15 Aug 2022 17:15:24 +0200 Subject: [PATCH 2/3] use generic comments --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 85b33ea..3480b9f 100755 --- a/scripts/install +++ b/scripts/install @@ -228,7 +228,7 @@ then fi #================================================= -# Start django_example_ynh via systemd +# Start the app server via systemd #================================================= ynh_script_progression --message="Starting django_example_ynh's services..." --weight=5 diff --git a/scripts/upgrade b/scripts/upgrade index dd78304..d211280 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -207,7 +207,7 @@ chmod o-rwx "$public_path" chmod o-rwx "$final_path" #================================================= -# Start django_example_ynh via systemd +# Start the app server via systemd #================================================= ynh_script_progression --message="Starting django_example_ynh's services..." --weight=5 From e0b23c010c9cb07af4745e436497ab8e942d75db Mon Sep 17 00:00:00 2001 From: JensDiemer Date: Mon, 15 Aug 2022 17:15:31 +0200 Subject: [PATCH 3/3] Bugfix change_url --- scripts/change_url | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 326e707..5bb62fb 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -30,7 +30,11 @@ final_path=$(ynh_app_setting_get --app="$app" --key=final_path) log_path=$(ynh_app_setting_get --app="$app" --key=log_path) port=$(ynh_app_setting_get --app="$app" --key=port) + db_pwd=$(ynh_app_setting_get --app="$app" --key=psqlpwd) +db_name=$(ynh_sanitize_dbid --db_name="$app") +db_user=$db_name + redis_db=$(ynh_app_setting_get --app="$app" --key=redis_db) #-------------------------------------------------