diff --git a/README.md b/README.md index 3da16bb..f4a7689 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ Please do your pull request to the [testing branch](https://github.com/YunoHost- To try the testing branch, please proceed like that. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --verbose +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug or -sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --verbose +sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug ``` diff --git a/README_fr.md b/README_fr.md index d43108e..93244f4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -82,7 +82,7 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour tester la branche testing, merci de procéder ainsi. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --verbose +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug ou -sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --verbose +sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug ``` diff --git a/manifest.json b/manifest.json index 40a4a03..3996937 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Framapad clone, a online editor providing collaborative editing in real-time.", "fr": "Clone de Framapad, un éditeur en ligne fournissant l'édition collaborative en temps réel." }, - "version": "1.7.0~ynh1", + "version": "1.7.0~ynh2", "url": "https://framapad.org", "license": "Apache-2.0", "maintainer": { @@ -14,7 +14,7 @@ "email": "maniackc_dev@crudelis.fr" }, "requirements": { - "yunohost": ">= 2.7.12" + "yunohost": ">= 3.3.3" }, "multi_instance": true, "services": [ diff --git a/scripts/change_url b/scripts/change_url index fc028f1..25b00ef 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -27,6 +27,7 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get $app final_path) mypads=$(ynh_app_setting_get $app mypads) +port=$(ynh_app_setting_get $app port) #================================================= # CHECK THE SYNTAX OF THE PATHS diff --git a/scripts/install b/scripts/install index 9c6c1dd..a1bfbe2 100644 --- a/scripts/install +++ b/scripts/install @@ -247,7 +247,7 @@ fi # SETUP FAIL2BAN #================================================= -ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failregex=" .* \"POST /mypads/api/auth/login HTTP/1.1\" 400" --max_retry=5 +ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failregex=" .* .POST /mypads/api/auth/login HTTP/1.1. 400" --max_retry=5 #================================================= # SETUP SSOWAT @@ -281,12 +281,6 @@ then ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" fi -#================================================= -# DEACTIVE MAINTENANCE MODE -#================================================= - -ynh_maintenance_mode_OFF - #================================================= # SEND A README FOR THE ADMIN #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3eb193d..04ed654 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -127,6 +127,16 @@ then ynh_setup_source "$final_path" # Download, check integrity and uncompress the source from app.src fi +#================================================= +# UPGRADE DEPENDENCIES +#================================================= + +if [ "$export" = "abiword" ]; then + ynh_install_app_dependencies $abiword_app_depencencies +elif [ "$export" = "libreoffice" ]; then + ynh_install_app_dependencies $libreoffice_app_dependencies +fi + #================================================= # NGINX CONFIGURATION #================================================= @@ -227,7 +237,7 @@ chown $app -R /var/log/$app/etherpad.log # UPGRADE FAIL2BAN #================================================= -ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failregex=" .* \"POST /mypads/api/auth/login HTTP/1.1\" 400" --max_retry=5 +ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failregex=" .* .POST /mypads/api/auth/login HTTP/1.1. 400" --max_retry=5 #================================================= # SETUP LOGROTATE