From 2306b93a05d6443339ede283445eb0a9d960392b Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 2 Jun 2017 18:34:13 +0200 Subject: [PATCH 1/3] [enh] Upgrade remove --- scripts/remove | 128 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 104 insertions(+), 24 deletions(-) diff --git a/scripts/remove b/scripts/remove index 59ef331..d709e2c 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,34 +1,114 @@ #!/bin/bash -# See comments in install script -app=$YNH_APP_INSTANCE_NAME +#================================================= +# GENERIC STARTING +#================================================= +# IMPORT GENERIC HELPERS +#================================================= -# Source YunoHost helpers source /usr/share/yunohost/helpers -# Retrieve app settings -domain=$(ynh_app_setting_get "$app" domain) +#================================================= +# LOAD SETTINGS +#================================================= -# Remove sources -sudo rm -rf /var/www/$app +app=$YNH_APP_INSTANCE_NAME -# Remove nginx configuration file -sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf +domain=$(ynh_app_setting_get $app domain) +port=$(ynh_app_setting_get $app port) +db_name=$(ynh_app_setting_get $app db_name) -### 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 ### +#================================================= +# STANDARD REMOVE +#================================================= +# STOP AND REMOVE SERVICE +#================================================= -### 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 the dedicated systemd config +ynh_remove_systemd_config -# Reload nginx service -sudo service nginx reload +#================================================= +# DISABLE SERVICE IN ADMIN PANEL +#================================================= + +if sudo yunohost service status | grep -q $app +then + echo "Remove $app service" + sudo yunohost service remove $app +fi + +#================================================= +# REMOVE DEPENDENCIES +#================================================= + +# Remove fake package and its dependencies +ynh_remove_app_dependencies + +#================================================= +# REMOVE THE SQL BDD +#================================================= + +# Remove a database if it exists, and the associated user +ynh_mysql_remove_db $db_name $db_name + +#================================================= +# REMOVE THE MAIN DIR OF THE APP +#================================================= + +# Remove the app directory securely +ynh_secure_remove "/var/www/$app" + +#================================================= +# REMOVE THE NGINX CONFIGURATION +#================================================= + +# Remove the dedicated nginx config +ynh_remove_nginx_config + +#================================================= +# REMOVE THE PHP-FPM CONFIGURATION +#================================================= + +# Remove the dedicated php-fpm config +ynh_remove_fpm_config + +#================================================= +# REMOVE THE LOGROTATE CONFIG +#================================================= + +# Remove the app's logrotate config. +ynh_remove_logrotate + +#================================================= +# CLOSE A PORT +#================================================= + +if sudo yunohost firewall list | grep -q "\- $port$" +then + echo "Close port $port" + QUIET sudo yunohost firewall disallow TCP $port +fi + +#================================================= +# SPECIFIC REMOVE +#================================================= +# REMOVE THE CRON FILE +#================================================= + +# Remove a cron file +ynh_secure_remove "/etc/cron.d/$app" + +# Remove a directory securely +ynh_secure_remove "/etc/$app/" + +# Remove the log files +ynh_secure_remove "/var/log/$app/" + +#================================================= +# GENERIC FINALISATION +#================================================= +# REMOVE DEDICATED USER +#================================================= + +# Delete a system user +ynh_system_user_delete $app From 832fc6523efebb8ef0e37e6c476950fce1e22ba1 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Mon, 5 Jun 2017 13:11:07 +0200 Subject: [PATCH 2/3] _common.sh --- scripts/remove | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/remove b/scripts/remove index d709e2c..506b499 100755 --- a/scripts/remove +++ b/scripts/remove @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +source _common.sh source /usr/share/yunohost/helpers #================================================= From 605a77212501a4c0873d8acf025fc8b5378a0d39 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sat, 17 Jun 2017 17:54:26 +0200 Subject: [PATCH 3/3] Fix wording and typos --- scripts/remove | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/remove b/scripts/remove index 506b499..ede1b0f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,7 +1,7 @@ #!/bin/bash #================================================= -# GENERIC STARTING +# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -29,7 +29,7 @@ db_name=$(ynh_app_setting_get $app db_name) ynh_remove_systemd_config #================================================= -# DISABLE SERVICE IN ADMIN PANEL +# REMOVE SERVICE FROM ADMIN PANEL #================================================= if sudo yunohost service status | grep -q $app @@ -42,42 +42,42 @@ fi # REMOVE DEPENDENCIES #================================================= -# Remove fake package and its dependencies +# Remove metapackage and its dependencies ynh_remove_app_dependencies #================================================= -# REMOVE THE SQL BDD +# REMOVE THE MYSQL DATABASE #================================================= -# Remove a database if it exists, and the associated user +# Remove a database if it exists, along with the associated user ynh_mysql_remove_db $db_name $db_name #================================================= -# REMOVE THE MAIN DIR OF THE APP +# REMOVE APP MAIN DIR #================================================= # Remove the app directory securely ynh_secure_remove "/var/www/$app" #================================================= -# REMOVE THE NGINX CONFIGURATION +# REMOVE NGINX CONFIGURATION #================================================= # Remove the dedicated nginx config ynh_remove_nginx_config #================================================= -# REMOVE THE PHP-FPM CONFIGURATION +# REMOVE PHP-FPM CONFIGURATION #================================================= # Remove the dedicated php-fpm config ynh_remove_fpm_config #================================================= -# REMOVE THE LOGROTATE CONFIG +# REMOVE LOGROTATE CONFIGURATION #================================================= -# Remove the app's logrotate config. +# Remove the app-specific logrotate config ynh_remove_logrotate #================================================= @@ -106,7 +106,7 @@ ynh_secure_remove "/etc/$app/" ynh_secure_remove "/var/log/$app/" #================================================= -# GENERIC FINALISATION +# GENERIC FINALIZATION #================================================= # REMOVE DEDICATED USER #=================================================