diff --git a/README.md b/README.md index 2c92472..c1cc953 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,6 @@ Can the app be used by multiple users? **Yes** * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/lstu%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/lstu/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/lstu%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/lstu/) - **More info on the documentation page:** https://yunohost.org/packaging_apps diff --git a/scripts/change_url b/scripts/change_url index 4972e18..d81e2c0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -113,9 +113,9 @@ fi #================================================= # SPECIFIC MODIFICATIONS #================================================= -# SETUP LSTU +# CONFIGURE LSTU #================================================= -ynh_script_progression --message="Updating lstu configuration..." +ynh_script_progression --message="Configuring lstu..." domain="$new_domain" path_url="$new_path" @@ -140,15 +140,6 @@ else fi ynh_store_file_checksum --file="$config" -#================================================= -# GENERIC FINALISATION -#================================================= -# START SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Starting a systemd service..." - -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Server available at" - #================================================= # UPDATE SSOWAT #================================================= @@ -166,6 +157,15 @@ then ynh_app_setting_set $app protected_regex "$domain_regex$path_url/login$","$domain_regex$path_url/logout$","$domain_regex$path_url/api$","$domain_regex$path_url/extensions$","$domain_regex$path_url/stats$","$domain_regex$path_url/d/.*$","$domain_regex$path_url/a$","$domain_regex$path_url/$" fi +#================================================= +# GENERIC FINALISATION +#================================================= +# START SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Starting a systemd service..." + +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Server available at" + #================================================= # RELOAD NGINX #================================================= diff --git a/scripts/install b/scripts/install index a34f0e7..6f4bd70 100644 --- a/scripts/install +++ b/scripts/install @@ -122,6 +122,8 @@ ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username=$app +#================================================= +# SPECIFIC SETUP #================================================= # CONFIGURE LSTU #================================================= @@ -148,14 +150,6 @@ fi ynh_store_file_checksum --file="$config" -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." - -# Create a dedicated systemd config -ynh_add_systemd_config - #================================================= # INSTALL LSTU #================================================= @@ -165,6 +159,14 @@ pushd $final_path carton install --deployment --without=sqlite --without=mysql popd +#================================================= +# SETUP SYSTEMD +#================================================= +ynh_script_progression --message="Configuring a systemd service..." + +# Create a dedicated systemd config +ynh_add_systemd_config + #================================================= # GENERIC FINALIZATION #=================================================