From 54d62b6d537a1cc8f223b597963c9d6af0bad098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 17 Nov 2023 21:13:00 +0100 Subject: [PATCH] cleaning --- scripts/install | 2 -- scripts/remove | 8 +++++--- scripts/restore | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 43d6005..d793ca2 100755 --- a/scripts/install +++ b/scripts/install @@ -39,8 +39,6 @@ ynh_setup_source --dest_dir="$install_dir" # Make addon Directory and unpack the addons to this directory ynh_script_progression --message="Setting up Zap addons source files..." - - pushd "$install_dir" mkdir -p extend/addon/zaddons mkdir addon diff --git a/scripts/remove b/scripts/remove index 30a7cd2..472e3e5 100755 --- a/scripts/remove +++ b/scripts/remove @@ -10,14 +10,16 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." +# REMOVE SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config -# Remove the dedicated php-fpm config +# Remove the dedicated PHP-FPM config ynh_remove_fpm_config # Remove the app-specific logrotate config diff --git a/scripts/restore b/scripts/restore index 55606b9..a4ea548 100755 --- a/scripts/restore +++ b/scripts/restore @@ -21,9 +21,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# RESTORE THE MYSQL DATABASE +# RESTORE THE SQL DATABASE #================================================= -ynh_script_progression --message="Restoring the MySQL database..." +ynh_script_progression --message="Restoring the PostgreSQL database..." ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql