From bef653b4d987ef4a0983c9dc528f1e6b1ae31588 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 4 May 2021 22:14:35 +0200 Subject: [PATCH] Fix --- scripts/install | 9 ++++++--- scripts/upgrade | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 5c4cb22..ad079eb 100644 --- a/scripts/install +++ b/scripts/install @@ -6,9 +6,12 @@ # IMPORT GENERIC HELPERS #================================================= +if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then + sleep 60 +fi + # Load common variables for all scripts. source _variables - source _common.sh source /usr/share/yunohost/helpers @@ -270,7 +273,7 @@ chown -R $app: $final_path/node_modules if [ $mypads -eq 1 ] then - # Add a link to etherpad to allow anonymous pads creation from Mypads. + # Add a link to Etherpad to allow anonymous pads creation from MyPads. ynh_replace_string --match_string="^ *\"DESCRIPTION\": .*" --replace_string="&Pads anonymes" --target_file=$final_path/node_modules/ep_mypads/static/l10n/fr.json ynh_replace_string --match_string="^ *\"DESCRIPTION\": .*" --replace_string="&Anonymous pads" --target_file=$final_path/node_modules/ep_mypads/static/l10n/en.json # And a link to etherpad admin from Mypads. @@ -288,7 +291,7 @@ fi #================================================= ynh_script_progression --message="Configuring Fail2Ban..." --weight=13 -# Create a dedicated fail2ban config +# Create a dedicated Fail2Ban config ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failregex=" .* .POST /mypads/api/auth/login HTTP/1.1. 400" --max_retry=5 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4b82926..6724a45 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -412,7 +412,7 @@ yunohost service add $app --description="Collaborative editor" --log="/var/log/$ #================================================= ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=8 -# Create a dedicated fail2ban config +# Create a dedicated Fail2Ban config ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failregex=" .* .POST /mypads/api/auth/login HTTP/1.1. 400" --max_retry=5 #=================================================