From fa21d3a85a6eb2d4c6327e24beff98a5e7f5e55f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 1 Sep 2021 18:35:38 +0200 Subject: [PATCH 1/2] Update install --- scripts/install | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 6f3d649..4a1fbba 100644 --- a/scripts/install +++ b/scripts/install @@ -133,14 +133,12 @@ setup="{ \"database\": \"postgres\", \"postgres:host\": \"localhost\", \"postgres:port\": \"5432\", - \"postgres:username\": \"$db_name\", - \"postgres:password\": \"$db_pwd\", - \"postgres:database\": \"$db_name\" + \"postgres:username\": \"${db_name}\", + \"postgres:password\": \"${db_pwd}\", + \"postgres:database\": \"${db_name}\" }" -pushd $final_path - ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}" -popd +ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}" #================================================= # NGINX CONFIGURATION From 99b77f5c13e6646976885d5e5cdcedad20035f8e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 1 Sep 2021 18:36:40 +0200 Subject: [PATCH 2/2] Fix --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 4a1fbba..85b9741 100644 --- a/scripts/install +++ b/scripts/install @@ -162,7 +162,7 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="Nodejs Forum" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Forum software" --log="/var/log/$app/$app.log" #================================================= # START ETHERPAD IN BACKGROUND diff --git a/scripts/restore b/scripts/restore index 5cee76c..c1dc329 100644 --- a/scripts/restore +++ b/scripts/restore @@ -101,7 +101,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="Nodejs Forum" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Forum software" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 4469497..4921433 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -128,7 +128,7 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="Nodejs Forum" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Forum software" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE