diff --git a/README.md b/README.md index 7d8665e..f801f96 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 Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. This package will install the same plugins than [Framapad](https://framapad.org/). -**Shipped version:** 1.6.2 +**Shipped version:** 1.6.3 ## Screenshots @@ -25,7 +25,7 @@ Or, you can find a config file for etherpad at this path `/var/www/etherpad_mypa ## Documentation - * Official documentation: http://etherpad.org/doc/v1.6.2 + * Official documentation: http://etherpad.org/doc/v1.6.3 * YunoHost documentation: There no other documentations, feel free to contribute. ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index f03f690..5d99714 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/inst Etherpad est un éditeur en ligne Open Source hautement personnalisable qui permet l'édition collaborative en temps réel. Ce paquet installera les mêmes plugins que [Framapad](https://framapad.org/). -**Version embarquée:** 1.6.2 +**Version embarquée:** 1.6.3 ## Captures d'écran @@ -25,7 +25,7 @@ Ou, vous pouvez trouver un fichier de configuration pour etherpad à `/var/www/e ## Documentation - * Documentation officielle: http://etherpad.org/doc/v1.6.2 + * Documentation officielle: http://etherpad.org/doc/v1.6.3 * Documentation YunoHost: Il n'y a pas d'autre documentation, n'hésitez pas à contribuer. ## Fonctionnalités spécifiques à YunoHost diff --git a/check_process b/check_process index 8d3b2f8..d1c332c 100644 --- a/check_process +++ b/check_process @@ -36,7 +36,7 @@ ; Checks setup_root=1 upgrade=1 - upgrade=1 from_commit=b86b9d09ed97bf04b7e1afad72376d8d695b418b + upgrade=1 from_commit=8bf300413ec3adcb416d168d2e9e98975dd9405b backup_restore=1 ;; Test abiword auto_remove=1 @@ -81,6 +81,6 @@ Email= Notification=down ;;; Upgrade options - ; commit=b86b9d09ed97bf04b7e1afad72376d8d695b418b - name=20 Jan 2017 b86b9d09ed97bf04b7e1afad72376d8d695b418b - manifest_arg=domain=DOMAIN&admin=USER&password=password&language=en&is_public=Yes&abiword=0& + ; commit=8bf300413ec3adcb416d168d2e9e98975dd9405b + name= Fix nodejs & global update + manifest_arg=domain=DOMAIN&admin=USER&password=password&language=en&is_public=1&abiword=0& diff --git a/conf/app.src b/conf/app.src index 593449f..af936a1 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.6.2.tar.gz -SOURCE_SUM=f810460e6714d85f8a4e7dfbd3d3790b +SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.6.3.tar.gz +SOURCE_SUM=b82c249377f7a0c702d6a51affd32eba SOURCE_SUM_PRG=md5sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/systemd.service b/conf/systemd.service index 1f24dbd..32b995f 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,6 +1,6 @@ [Unit] Description=Etherpad-lite, the collaborative editor. -After=network.target +After=syslog.target network.target [Service] Type=simple @@ -9,6 +9,7 @@ Group=__APP__ ExecStartPre=__NODEJS__ Environment="PATH=__ENV_PATH__" ExecStart=__FINALPATH__/bin/safeRun.sh /var/log/__APP__/etherpad.log +Restart=always [Install] WantedBy=multi-user.target diff --git a/manifest.json b/manifest.json index 46f696e..233d79d 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.6.2~ynh1", + "version": "1.6.3~ynh1", "url": "https://framapad.org", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 522fde5..746baa4 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -454,6 +454,11 @@ EOF ynh_store_file_checksum "$finalfail2banfilterconf" sudo systemctl restart fail2ban + if local fail2ban_error="$(tail -n50 /var/log/fail2ban.log | grep "WARNING Command.*$app.*addfailregex")" + then + echo "[ERR] Fail2ban fail to load the jail for $app" >&2 + echo "WARNING${fail2ban_error#*WARNING}" >&2 + fi } # Remove the dedicated fail2ban config (jail and filter conf files)