diff --git a/check_process b/check_process index 40958ed..afc2d18 100644 --- a/check_process +++ b/check_process @@ -20,7 +20,8 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=CommitHash + #3.7.6~ynh1 + upgrade=1 from_commit=e49200ad7f98acba70737dc7db314c51a2a07802 backup_restore=1 multi_instance=1 incorrect_path=1 @@ -43,7 +44,7 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& + ; commit=e49200ad7f98acba70737dc7db314c51a2a07802 + name=3.7.6~ynh1(11oct2020) + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=password1234&port=666& diff --git a/manifest.json b/manifest.json index 11365cd..214c967 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Lightweight Blog-Engine.", "fr": "Un moteur de blog léger." }, - "version": "3.7.6~ynh1", + "version": "3.7.6~ynh2", "url": "https://blogotext.org/", "license": "MIT", "maintainer": { diff --git a/scripts/install b/scripts/install index 99f0314..dd98536 100755 --- a/scripts/install +++ b/scripts/install @@ -83,10 +83,10 @@ ynh_print_info "Configuring firewall..." ### - Remove the section "CLOSE A PORT" in the remove script # Find a free port -port=$(ynh_find_port 8095) +#port=$(ynh_find_port 8095) # Open this port -ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port -ynh_app_setting_set $app port $port +#ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port +#ynh_app_setting_set $app port $port #================================================= # INSTALL DEPENDENCIES diff --git a/scripts/remove b/scripts/remove index 36ca41c..b119b2a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,7 +17,7 @@ ynh_print_info "Loading installation settings..." app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) -port=$(ynh_app_setting_get $app port) +#port=$(ynh_app_setting_get $app port) db_name=$(ynh_app_setting_get $app db_name) db_user=$db_name final_path=$(ynh_app_setting_get $app final_path) @@ -95,6 +95,15 @@ ynh_print_info "Removing logrotate configuration" # CLOSE A PORT #================================================= +#if yunohost firewall list | grep -q "\- $port$" +#then +# ynh_print_info "Closing port $port" +# ynh_exec_warn_less yunohost firewall disallow TCP $port +#fi + +# close port if it was previously opened +# https://github.com/YunoHost-Apps/blogotext_ynh/pull/13 +port=$(ynh_app_setting_get $app port) if yunohost firewall list | grep -q "\- $port$" then ynh_print_info "Closing port $port"