YunoHost-Apps/etherpad_mypads_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/etherpad_mypads_ynh.git synced 2024-09-03 18:36:09 +02:00
Code Issues Activity Actions

Merge pull request #30 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Maniack Crudelis 2018-02-16 00:46:32 +01:00 • committed by GitHub
commit 5006e0316c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -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. 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/). This package will install the same plugins than [Framapad](https://framapad.org/).
**Shipped version:** 1.6.2 **Shipped version:** 1.6.3
## Screenshots ## Screenshots
@ -25,7 +25,7 @@ Or, you can find a config file for etherpad at this path `/var/www/etherpad_mypa
## Documentation ## 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 documentation: There no other documentations, feel free to contribute.
## YunoHost specific features ## YunoHost specific features

4
README_fr.md
View file

@ -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. 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/). 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 ## Captures d'écran
@ -25,7 +25,7 @@ Ou, vous pouvez trouver un fichier de configuration pour etherpad à `/var/www/e
## Documentation ## 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. * Documentation YunoHost: Il n'y a pas d'autre documentation, n'hésitez pas à contribuer.
## Fonctionnalités spécifiques à YunoHost ## Fonctionnalités spécifiques à YunoHost

8
check_process
View file

@ -36,7 +36,7 @@
; Checks ; Checks
setup_root=1 setup_root=1
upgrade=1 upgrade=1
upgrade=1 from_commit=b86b9d09ed97bf04b7e1afad72376d8d695b418b upgrade=1 from_commit=8bf300413ec3adcb416d168d2e9e98975dd9405b
backup_restore=1 backup_restore=1
;; Test abiword ;; Test abiword
auto_remove=1 auto_remove=1
@ -81,6 +81,6 @@
Email= Email=
Notification=down Notification=down
;;; Upgrade options ;;; Upgrade options
; commit=b86b9d09ed97bf04b7e1afad72376d8d695b418b ; commit=8bf300413ec3adcb416d168d2e9e98975dd9405b
name=20 Jan 2017 b86b9d09ed97bf04b7e1afad72376d8d695b418b name= Fix nodejs & global update
manifest_arg=domain=DOMAIN&admin=USER&password=password&language=en&is_public=Yes&abiword=0& manifest_arg=domain=DOMAIN&admin=USER&password=password&language=en&is_public=1&abiword=0&

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.6.2.tar.gz SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.6.3.tar.gz
SOURCE_SUM=f810460e6714d85f8a4e7dfbd3d3790b SOURCE_SUM=b82c249377f7a0c702d6a51affd32eba
SOURCE_SUM_PRG=md5sum SOURCE_SUM_PRG=md5sum
ARCH_FORMAT=tar.gz ARCH_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

3
conf/systemd.service
View file

@ -1,6 +1,6 @@
[Unit] [Unit]
Description=Etherpad-lite, the collaborative editor. Description=Etherpad-lite, the collaborative editor.
After=network.target After=syslog.target network.target
[Service] [Service]
Type=simple Type=simple
@ -9,6 +9,7 @@ Group=__APP__
ExecStartPre=__NODEJS__ ExecStartPre=__NODEJS__
Environment="PATH=__ENV_PATH__" Environment="PATH=__ENV_PATH__"
ExecStart=__FINALPATH__/bin/safeRun.sh /var/log/__APP__/etherpad.log ExecStart=__FINALPATH__/bin/safeRun.sh /var/log/__APP__/etherpad.log
Restart=always
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Framapad clone, a online editor providing collaborative editing in real-time.", "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." "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", "url": "https://framapad.org",
"license": "Apache-2.0", "license": "Apache-2.0",
"maintainer": { "maintainer": {

5
scripts/_common.sh
View file

@ -454,6 +454,11 @@ EOF
ynh_store_file_checksum "$finalfail2banfilterconf" ynh_store_file_checksum "$finalfail2banfilterconf"
sudo systemctl restart fail2ban 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) # Remove the dedicated fail2ban config (jail and filter conf files)