From 003b48c3ffe5f786f5a00f7addfee142d79b08d3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 9 Sep 2021 17:49:45 +0200 Subject: [PATCH] Fix --- scripts/remove | 8 +------- scripts/restore | 6 +++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/scripts/remove b/scripts/remove index e6aaf28..28162e9 100644 --- a/scripts/remove +++ b/scripts/remove @@ -78,7 +78,7 @@ ynh_secure_remove --file="/etc/wireguard" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated nginx config ynh_remove_nginx_config @@ -101,12 +101,6 @@ then ynh_exec_warn_less yunohost firewall disallow UDP $port_wg fi -if yunohost firewall list | grep -q "\- $port$" -then - ynh_script_progression --message="Closing port $port..." --weight=1 - ynh_exec_warn_less yunohost firewall disallow TCP $port -fi - #================================================= # SPECIFIC REMOVE #================================================= diff --git a/scripts/restore b/scripts/restore index 624d929..51bd50a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -94,10 +94,10 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=5 # Add buster-backports gpg key ynh_install_repo_gpg --key="https://ftp-master.debian.org/keys/archive-key-10.asc" --name="$app" -#Add buster-backports repo +# Add buster-backports repo ynh_add_repo --uri="http://deb.debian.org/debian" --suite="buster-backports" --component="main" --name="$app" -#Add pin-priority for wireguard packages +# Add pin-priority for wireguard packages ynh_pin_repo --package="wireguard*" --pin="origin deb http://deb.debian.org/debian buster-backports main" --priority=995 --name="$app" # Update the list of package with the new repo @@ -148,7 +148,7 @@ sleep 5 #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload