From 94e8e12c6972cd249e2b3f664ab4f4e24b16b01f Mon Sep 17 00:00:00 2001
From: jarod5001 <68397534+jarod5001@users.noreply.github.com>
Date: Sat, 23 Apr 2022 15:39:03 +0200
Subject: [PATCH] Update remove

---
 scripts/remove | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index 29da1fd..bd200de 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,11 +17,11 @@ ynh_script_progression --message="Loading installation settings..." --time --wei
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
-port=$(ynh_app_setting_get --app=$app --key=port)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_user=$db_name
+# port=$(ynh_app_setting_get --app=$app --key=port)
+# db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+# db_user=$db_name
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-datadir=$(ynh_app_setting_get --app=$app --key=datadir)
+# datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # STANDARD REMOVE
@@ -39,10 +39,10 @@ fi
 #=================================================
 # STOP AND REMOVE SERVICE
 #=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --time --weight=1
+# ynh_script_progression --message="Stopping and removing the systemd service..." --time --weight=1
 
 # Remove the dedicated systemd config
-ynh_remove_systemd_config
+# ynh_remove_systemd_config
 
 #=================================================
 # REMOVE LOGROTATE CONFIGURATION
@@ -55,10 +55,10 @@ ynh_remove_logrotate
 #=================================================
 # REMOVE THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Removing the MySQL database..." --time --weight=1
+# ynh_script_progression --message="Removing the MySQL database..." --time --weight=1
 
 # Remove a database if it exists, along with the associated user
-ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
+# ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
 
 #=================================================
 # REMOVE APP MAIN DIR
@@ -73,11 +73,11 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 
 # Remove the data directory if --purge option is used
-if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
-then
-	ynh_script_progression --message="Removing app data directory..." --time --weight=1
-	ynh_secure_remove --file="$datadir"
-fi
+# if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
+# then
+# 	ynh_script_progression --message="Removing app data directory..." --time --weight=1
+# 	ynh_secure_remove --file="$datadir"
+# fi
 
 #=================================================
 # REMOVE NGINX CONFIGURATION
@@ -90,28 +90,28 @@ ynh_remove_nginx_config
 #=================================================
 # REMOVE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..." --time --weight=1
+# ynh_script_progression --message="Removing PHP-FPM configuration..." --time --weight=1
 
 # Remove the dedicated PHP-FPM config
-ynh_remove_fpm_config
+# ynh_remove_fpm_config
 
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Removing dependencies..." --time --weight=1
+# ynh_script_progression --message="Removing dependencies..." --time --weight=1
 
 # Remove metapackage and its dependencies
-ynh_remove_app_dependencies
+# ynh_remove_app_dependencies
 
 #=================================================
 # CLOSE A PORT
 #=================================================
 
-if yunohost firewall list | grep -q "\- $port$"
-then
-	ynh_script_progression --message="Closing port $port..." --time --weight=1
-	ynh_exec_warn_less yunohost firewall disallow TCP $port
-fi
+# if yunohost firewall list | grep -q "\- $port$"
+# then
+# 	ynh_script_progression --message="Closing port $port..." --time --weight=1
+# 	ynh_exec_warn_less yunohost firewall disallow TCP $port
+# fi
 
 #=================================================
 # REMOVE FAIL2BAN CONFIGURATION
@@ -126,10 +126,10 @@ ynh_remove_fail2ban_config
 #=================================================
 # REMOVE VARIOUS FILES
 #=================================================
-ynh_script_progression --message="Removing various files..." --time --weight=1
+# ynh_script_progression --message="Removing various files..." --time --weight=1
 
 # Remove a cron file
-ynh_secure_remove --file="/etc/cron.d/$app"
+# ynh_secure_remove --file="/etc/cron.d/$app"
 
 # Remove a directory securely
 ynh_secure_remove --file="/etc/$app"