aboutsummaryrefslogtreecommitdiff
path: root/scripts/remove
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2020-03-29 21:56:56 +0200
committeryalh76 <yalh@yahoo.com>2020-03-29 21:56:56 +0200
commit64149e99b7b28f76f6cc25607637692610cb1bd6 (patch)
tree2cfceadeceae634791a7fb207268b5943f3e0f5e /scripts/remove
parent25a20b1d17f0b8752a39259c3b73a451e203255d (diff)
parentbf0dea0f437c00db213c27da299a0dda65810d6a (diff)
downloadmastodon_ynh-64149e99b7b28f76f6cc25607637692610cb1bd6.tar.gz
mastodon_ynh-64149e99b7b28f76f6cc25607637692610cb1bd6.tar.bz2
mastodon_ynh-64149e99b7b28f76f6cc25607637692610cb1bd6.zip
Merge branch 'testing' into ldap
Diffstat (limited to 'scripts/remove')
-rw-r--r--scripts/remove18
1 files changed, 12 insertions, 6 deletions
diff --git a/scripts/remove b/scripts/remove
index 19cbf29..f2b2e16 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -7,8 +7,9 @@
#=================================================
source _common.sh
-source ynh_install_ruby
+source ynh_install_ruby__2
source ynh_add_extra_apt_repos__3
+source ynh_add_swap
source /usr/share/yunohost/helpers
#=================================================
@@ -26,23 +27,24 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#=================================================
# STANDARD REMOVE
#=================================================
-# REMOVE SERVICE FROM ADMIN PANEL
+# REMOVE SERVICE INTEGRATION IN YUNOHOST
#=================================================
+ynh_script_progression --message="Removing service integration in YunoHost..." --weight=2
-# Remove a service from the admin panel, added by `yunohost service add`
-if yunohost service status "$app-web" >/dev/null 2>&1
+# Remove the service from the list of services known by Yunohost (added from `yunohost service add`)
+if ynh_exec_warn_less yunohost service status "$app-web" >/dev/null
then
ynh_script_progression --message="Removing $app-web service..." --weight=2
yunohost service remove "$app-web"
fi
-if yunohost service status "$app-sidekiq" >/dev/null 2>&1
+if ynh_exec_warn_less yunohost service status "$app-sidekiq" >/dev/null
then
ynh_script_progression --message="Removing $app-sidekiq service..." --weight=2
yunohost service remove "$app-sidekiq"
fi
-if yunohost service status "$app-streaming" >/dev/null 2>&1
+if ynh_exec_warn_less yunohost service status "$app-streaming" >/dev/null
then
ynh_script_progression --message="Removing $app-streaming service..." --weight=2
yunohost service remove "$app-streaming"
@@ -98,10 +100,14 @@ ynh_remove_nginx_config
#=================================================
# REMOVE THE CRON FILE
#=================================================
+ynh_script_progression --message="Removing the cron file..." --weight=2
# Remove a cron file
ynh_secure_remove --file="/etc/cron.d/$app"
+# Remove swap
+ynh_del_swap
+
#=================================================
# GENERIC FINALIZATION
#=================================================