From 9e58aa24bc398fe31effb1d0acf5993ff9daf4a1 Mon Sep 17 00:00:00 2001
From: Sebastian Gumprich <sebastian.gumprich@38.de>
Date: Tue, 13 Jun 2017 22:18:57 +0200
Subject: [PATCH] add removal of app

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

diff --git a/scripts/remove b/scripts/remove
index 0376a93..c9cc2a5 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -7,6 +7,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 # Source YunoHost helpers
 source /usr/share/yunohost/helpers
+source ./_common.sh
 
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
@@ -17,20 +18,17 @@ sudo rm -rf /var/www/$app
 # Remove nginx configuration file
 sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf
 
-### PHP (remove if not used) ###
-# If a dedicated php-fpm process is used:
-# sudo rm -f /etc/php5/fpm/pool.d/$app.conf
-# sudo service php5-fpm reload
-### PHP end ###
+# Remove cronjob
+sudo rm -f /etc/cron.d/$app
 
-### MySQL (remove if not used) ###
-# If a MySQL database is used:
-# # Drop MySQL database and user
-# dbname=$app
-# dbuser=$app
-# ynh_mysql_drop_db "$dbname" || true
-# ynh_mysql_drop_user "$dbuser" || true
-### MySQL end ###
+# Remove PHP7.0
+ynh_remove_php7
+
+# Remove mysql user and database
+dbname=$app
+dbuser=$app
+ynh_mysql_drop_db "$dbname" || true
+ynh_mysql_drop_user "$dbuser" || true
 
 # Reload nginx service
 sudo service nginx reload