From e8e4483e284df14149baa04b0c2ccefcb5f4efdc Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 22 Dec 2020 21:38:05 +0100 Subject: [PATCH] Found some inconsistencies in the 'yunohost service add' commands --- scripts/upgrade | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3f49609..29f3ed9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -285,16 +285,11 @@ ynh_script_progression --message="Securing files and directories..." chown -R "$app":"$app" "$final_path" #================================================= -# SETUP SSOWAT +# INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." +ynh_script_progression --message="Integrating service in YunoHost..." -# Make app public if necessary -if [ $is_public -eq 1 ] -then - # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" -fi +yunohost service add $app --description "$app daemon for Pleroma" #================================================= # START SYSTEMD SERVICE @@ -306,6 +301,18 @@ if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then sleep 60 fi +#================================================= +# SETUP SSOWAT +#================================================= +ynh_script_progression --message="Upgrading SSOwat configuration..." + +# Make app public if necessary +if [ $is_public -eq 1 ] +then + # unprotected_uris allows SSO credentials to be passed anyway + ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" +fi + #================================================= # RELOAD NGINX #=================================================