From 3fac0894ba8e6079680f972757f60610aa2bc819 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 13:47:58 +0100 Subject: [PATCH 1/5] Small typos --- check_process | 2 -- scripts/install | 6 +++--- scripts/remove | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/check_process b/check_process index f8ecaa3..74e6c30 100644 --- a/check_process +++ b/check_process @@ -21,8 +21,6 @@ incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none diff --git a/scripts/install b/scripts/install index 328ce40..3d8f0bd 100644 --- a/scripts/install +++ b/scripts/install @@ -191,9 +191,9 @@ chown -R $app: $final_path #================================================= # SETUP FAIL2BAN #================================================= -ynh_script_progression --message="Configuring Fail2ban..." --weight=8 +ynh_script_progression --message="Configuring Fail2Ban..." --weight=8 -# Create a dedicated fail2ban config +# Create a dedicated Fail2Ban config ynh_add_fail2ban_config --logpath="$final_path/app/data/_data_/_default_/logs/fail2ban/auth-fail.log" --failregex="Auth failed: ip=.*$" #================================================= @@ -206,7 +206,7 @@ if [ $is_public -eq 1 ] then # Everyone can access the app. # The "main" permission is automatically created before the install script. - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission "main" --add "visitors" fi #================================================= diff --git a/scripts/remove b/scripts/remove index e005973..b3b3237 100644 --- a/scripts/remove +++ b/scripts/remove @@ -73,9 +73,9 @@ ynh_remove_logrotate #================================================= # REMOVE FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Removing Fail2ban configuration..." --weight=8 +ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=8 -# Remove the dedicated fail2ban config +# Remove the dedicated Fail2Ban config ynh_remove_fail2ban_config #================================================= diff --git a/scripts/restore b/scripts/restore index 68b81bf..beb2a80 100644 --- a/scripts/restore +++ b/scripts/restore @@ -95,7 +95,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the Fail2ban configuration..." --weight=6 +ynh_script_progression --message="Restoring the Fail2Ban configuration..." --weight=6 ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 4569203..01ca382 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -180,9 +180,9 @@ find $final_path/. -type f -exec chmod 644 {} \; #================================================= # UPGRADE FAIL2BAN #================================================= -ynh_script_progression --message="Reconfiguring Fail2ban..." --weight=9 +ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=9 -# Create a dedicated fail2ban config +# Create a dedicated Fail2Ban config ynh_add_fail2ban_config --logpath="$final_path/app/data/_data_/_default_/logs/fail2ban/auth-fail.log" --failregex="Auth failed: ip=.*$" #================================================= From 5ee2bac6ae0bee3f5d718e42ae62038301771d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Dec 2020 23:15:09 +0100 Subject: [PATCH 2/5] Set SVG badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1eff4a3..f973faf 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Rainloop for YunoHost [![Integration level](https://dash.yunohost.org/integration/rainloop.svg)](https://dash.yunohost.org/appci/app/rainloop) ![](https://ci-apps.yunohost.org/ci/badges/rainloop.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/rainloop.maintain.svg) -[![Install Rainloop with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=rainloop) +[![Install Rainloop with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=rainloop) *[Lire ce readme en français.](./README_fr.md)* From 3abd5a373f8cc3529b2a961af4941c1f4c4319e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 26 Dec 2020 23:15:24 +0100 Subject: [PATCH 3/5] Set SVG badge --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index d8b51c7..32902b0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Rainloop pour YunoHost [![Integration level](https://dash.yunohost.org/integration/rainloop.svg)](https://dash.yunohost.org/appci/app/rainloop) ![](https://ci-apps.yunohost.org/ci/badges/rainloop.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/rainloop.maintain.svg) -[![Installer Rainloop avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=rainloop) +[![Installer Rainloop avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=rainloop) *[Read this readme in english.](./README.md)* From 9fff4bd678210f271a42dee7d502a2a287d1b3bd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 16 Jan 2021 22:23:44 +0100 Subject: [PATCH 4/5] upgrade to 1.15.0 --- README.md | 2 +- README_fr.md | 2 +- check_process | 1 - conf/app.src | 4 ++-- manifest.json | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f973faf..bf22173 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to Rainloop is a lightweight webmail. -**Shipped version:** 1.14.0 +**Shipped version:** 1.15.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 32902b0..38fa854 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Rainloop est un webmail léger. -**Version incluse:** 1.14.0 +**Version incluse:** 1.15.0 ## Captures d'écran diff --git a/check_process b/check_process index 74e6c30..7b125fb 100644 --- a/check_process +++ b/check_process @@ -18,7 +18,6 @@ upgrade=1 from_commit=e26b7e5823858ea5f526659f320692a2768786b5 backup_restore=1 multi_instance=1 - incorrect_path=1 port_already_use=0 change_url=1 ;;; Options diff --git a/conf/app.src b/conf/app.src index ae685cc..5b10bba 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/RainLoop/rainloop-webmail/releases/download/v1.14.0/rainloop-community-1.14.0.zip -SOURCE_SUM=de5809c27615123d6d422bcc3d4c76868f03d292bbaba82c4392c349aa531829 +SOURCE_URL=https://github.com/RainLoop/rainloop-webmail/releases/download/v1.15.0/rainloop-community-1.15.0.zip +SOURCE_SUM=cbfa285d015e923a32440a64be0085347e96ad40fe40758864bb2fcc26cdad5e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index a548664..53719aa 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Lightweight multi-account webmail", "fr": "Webmail léger multi-comptes" }, - "version": "1.14.0~ynh1", + "version": "1.15.0~ynh1", "url": "https://www.rainloop.net/", "license": "AGPL-3.0-or-later", "maintainer": { From 21b00d5f33fd4f5e9a42990ad1f53186651bc4d0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 16 Jan 2021 22:39:55 +0100 Subject: [PATCH 5/5] Update upgrade --- scripts/upgrade | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 01ca382..4f93f74 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,13 +81,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #=================================================