diff options
| author | eric_G <46165813+ericgaspar@users.noreply.github.com> | 2025-09-01 10:16:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-01 10:16:50 +0200 |
| commit | d9d151b9bc84d62a4ac9371454f6de4f3c1c80b2 (patch) | |
| tree | 6627f348ce8fac8774f618c72a0e08e7ba976429 /scripts | |
| parent | 4976431397f6e9824526276bdd94d62cefb3548a (diff) | |
| parent | edbf9871a19fd30634d86e7ff41d4f33b92521d4 (diff) | |
| download | mastodon_ynh-d9d151b9bc84d62a4ac9371454f6de4f3c1c80b2.tar.gz mastodon_ynh-d9d151b9bc84d62a4ac9371454f6de4f3c1c80b2.tar.bz2 mastodon_ynh-d9d151b9bc84d62a4ac9371454f6de4f3c1c80b2.zip | |
Merge branch 'testing' into ruby-and-nodejs-resources
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/remove | 14 | ||||
| -rw-r--r-- | scripts/restore | 4 | ||||
| -rw-r--r-- | scripts/upgrade | 13 |
3 files changed, 7 insertions, 24 deletions
diff --git a/scripts/remove b/scripts/remove index e97be10..5901cc8 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,26 +7,18 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= -# REMOVE SYSTEMD SERVICE -#================================================= ynh_script_progression "Removing system configurations related to $app..." # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_hide_warnings yunohost service status "$app-web" >/dev/null -then - ynh_script_progression "Removing $app-web service integration..." +if ynh_hide_warnings yunohost service status "$app-web" >/dev/null; then yunohost service remove "$app-web" fi -if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null -then - ynh_script_progression "Removing $app-sidekiq service integration..." +if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null; then yunohost service remove "$app-sidekiq" fi -if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null -then - ynh_script_progression "Removing $app-streaming service integration..." +if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null; then yunohost service remove "$app-streaming" fi diff --git a/scripts/restore b/scripts/restore index 2abaa4d..cdaf6a5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,8 +6,6 @@ source ../settings/scripts/ynh_add_swap source /usr/share/yunohost/helpers #================================================= -# STANDARD RESTORATION STEPS -#================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression "Restoring the app main directory..." @@ -53,8 +51,6 @@ popd #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= ynh_script_progression "Restoring system configurations related to $app..." ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 1d28afd..5ab2a51 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,11 +16,11 @@ fi #================================================= # STOP SYSTEMD SERVICE #================================================= - ynh_script_progression "Stopping $app's systemd service..." - ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye" - ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye" - ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log + +ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye" +ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye" +ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log #================================================= # ENSURE DOWNWARD COMPATIBILITY @@ -47,11 +47,8 @@ ynh_script_progression "Adding $swap_needed Mo to swap..." ynh_add_swap --size=$swap_needed #================================================= -# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) -#================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= - ynh_script_progression "Upgrading source files..." # Download, check integrity, uncompress and patch the source from manifest.toml @@ -107,8 +104,6 @@ mkdir -p /var/log/$app ynh_config_add_logrotate #================================================= -# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...) -#================================================= # UPDATE A CONFIG FILE #================================================= ynh_script_progression "Updating a config file..." |