aboutsummaryrefslogtreecommitdiff
path: root/scripts/remove
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2022-01-07 01:25:26 +0100
committeryalh76 <yalh@yahoo.com>2022-01-07 01:25:26 +0100
commita40b4e0e0b05ff40ab10f749435e880322ea9ba6 (patch)
tree19ecc95d4b3b68a0d74f3f1591a248b8de6ded47 /scripts/remove
parent1476f17251ea0b339390cfa5210e258342ea5a4a (diff)
downloadmastodon_ynh-a40b4e0e0b05ff40ab10f749435e880322ea9ba6.tar.gz
mastodon_ynh-a40b4e0e0b05ff40ab10f749435e880322ea9ba6.tar.bz2
mastodon_ynh-a40b4e0e0b05ff40ab10f749435e880322ea9ba6.zip
Full upgrade
Diffstat (limited to 'scripts/remove')
-rw-r--r--scripts/remove28
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/remove b/scripts/remove
index 42b0109..d6d2afd 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -20,7 +20,7 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain)
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$(ynh_sanitize_dbid --db_name=$app)
+db_user=$(ynh_app_setting_get --app=$app --key=db_user)
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
#=================================================
@@ -67,17 +67,6 @@ ynh_script_progression --message="Removing the PostgreSQL database..."
ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..."
-
-# Remove metapackage and its dependencies
-ynh_remove_ruby
-ynh_remove_nodejs
-ynh_remove_app_dependencies
-ynh_remove_extra_repo
-
-#=================================================
# REMOVE APP MAIN DIR
#=================================================
ynh_script_progression --message="Removing app main directory..."
@@ -94,11 +83,22 @@ ynh_script_progression --message="Removing NGINX web server configuration..."
ynh_remove_nginx_config
#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Removing dependencies..."
+
+# Remove metapackage and its dependencies
+ynh_remove_ruby
+ynh_remove_nodejs
+ynh_remove_app_dependencies
+ynh_remove_extra_repo
+
+#=================================================
# SPECIFIC REMOVE
#=================================================
-# REMOVE THE CRON FILE
+# REMOVE VARIOUS FILES
#=================================================
-ynh_script_progression --message="Removing the cron file..."
+ynh_script_progression --message="Removing various files..."
# Remove a cron file
ynh_secure_remove --file="/etc/cron.d/$app"