mirror of
https://github.com/YunoHost-Apps/etherpad_mypads_ynh.git
synced 2024-09-03 18:36:09 +02:00
Merge branch 'testing' into delete-log-removal
This commit is contained in:
eric_G
GitHub
commit
f559faf3d6
22 changed files with 92 additions and 222 deletions
|
|
@ -23,18 +23,13 @@ This version of Etherpad is preconfigured with a collection of plugins:
|
|||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad*
|
||||
- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment*
|
||||
- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text*
|
||||
- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.*
|
||||
- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count*
|
||||
- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited*
|
||||
- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color*
|
||||
- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size*
|
||||
- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers*
|
||||
- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown*
|
||||
- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking*
|
||||
- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript*
|
||||
|
||||
|
||||
**Shipped version:** 1.9.1~ynh3
|
||||
|
||||
**Shipped version:** 2.1.0~ynh1
|
||||
|
||||
**Demo:** <https://video.etherpad.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,18 +23,13 @@ This version of Etherpad is preconfigured with a collection of plugins:
|
|||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad*
|
||||
- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment*
|
||||
- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text*
|
||||
- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.*
|
||||
- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count*
|
||||
- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited*
|
||||
- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color*
|
||||
- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size*
|
||||
- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers*
|
||||
- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown*
|
||||
- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking*
|
||||
- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript*
|
||||
|
||||
|
||||
**Versión actual:** 1.9.1~ynh3
|
||||
|
||||
**Versión actual:** 2.1.0~ynh1
|
||||
|
||||
**Demo:** <https://video.etherpad.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,18 +23,13 @@ This version of Etherpad is preconfigured with a collection of plugins:
|
|||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad*
|
||||
- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment*
|
||||
- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text*
|
||||
- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.*
|
||||
- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count*
|
||||
- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited*
|
||||
- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color*
|
||||
- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size*
|
||||
- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers*
|
||||
- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown*
|
||||
- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking*
|
||||
- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript*
|
||||
|
||||
|
||||
**Paketatutako bertsioa:** 1.9.1~ynh3
|
||||
|
||||
**Paketatutako bertsioa:** 2.1.0~ynh1
|
||||
|
||||
**Demoa:** <https://video.etherpad.com>
|
||||
|
||||
|
|
|
|||
10
README_fr.md
10
README_fr.md
|
|
@ -20,21 +20,15 @@ Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers
|
|||
|
||||
Cette version d'Etherpad est préconfigurée avec une collection de plugins:
|
||||
|
||||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour etherpad*
|
||||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour Etherpad*
|
||||
- [ep_align](https://www.npmjs.com/package/ep_align) - *Ajout de l'alignement à gauche/centre/droit/justifié*
|
||||
- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Affichage de l'auteur lorsqu'on passe la souris au dessus d'un texte*
|
||||
- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Ajout de commentaire dans la barre latéral + lien avec le texte du pad*
|
||||
- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Ajout du compte de paragraphes, mots, caractères*
|
||||
- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Suppression des pads qui n'ont jamais été édités*
|
||||
- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Possibilité de changer la couleur de la police*
|
||||
- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Possibilité de changer la taille de la police*
|
||||
- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Possibilité de définir des titres*
|
||||
- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Editiion et export en Markdown*
|
||||
- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Ajout de la correction orthographique*
|
||||
- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices*
|
||||
|
||||
|
||||
**Version incluse :** 1.9.1~ynh3
|
||||
**Version incluse :** 2.1.0~ynh1
|
||||
|
||||
**Démo :** <https://video.etherpad.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,18 +23,13 @@ This version of Etherpad is preconfigured with a collection of plugins:
|
|||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad*
|
||||
- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment*
|
||||
- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text*
|
||||
- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.*
|
||||
- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count*
|
||||
- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited*
|
||||
- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color*
|
||||
- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size*
|
||||
- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers*
|
||||
- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown*
|
||||
- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking*
|
||||
- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript*
|
||||
|
||||
|
||||
**Versión proporcionada:** 1.9.1~ynh3
|
||||
|
||||
**Versión proporcionada:** 2.1.0~ynh1
|
||||
|
||||
**Demo:** <https://video.etherpad.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,18 +23,13 @@ This version of Etherpad is preconfigured with a collection of plugins:
|
|||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad*
|
||||
- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment*
|
||||
- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text*
|
||||
- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.*
|
||||
- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count*
|
||||
- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited*
|
||||
- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color*
|
||||
- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size*
|
||||
- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers*
|
||||
- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown*
|
||||
- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking*
|
||||
- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript*
|
||||
|
||||
|
||||
**分发版本：** 1.9.1~ynh3
|
||||
|
||||
**分发版本：** 2.1.0~ynh1
|
||||
|
||||
**演示：** <https://video.etherpad.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -434,7 +434,7 @@ __COMMENT_IF_LDAP_DISABLED__ },
|
|||
/*
|
||||
* Restrict socket.io transport methods
|
||||
*/
|
||||
"socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
|
||||
"socketTransportProtocols" : ["websocket", "polling"],
|
||||
|
||||
"socketIo": {
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -9,9 +9,8 @@ Group=__APP__
|
|||
WorkingDirectory=__INSTALL_DIR__/
|
||||
Environment=ETHERPAD_PRODUCTION=true
|
||||
Environment="__YNH_NODE_LOAD_PATH__"
|
||||
ExecStart=__YNH_NODE__ __INSTALL_DIR__/src/node/server.js
|
||||
StandardOutput=append:/var/log/__APP__/etherpad.log
|
||||
StandardError=inherit
|
||||
Environment="NODE_ENV=production"
|
||||
ExecStart=__INSTALL_DIR__/bin/run.sh
|
||||
Restart=always
|
||||
|
||||
# Sandboxing options to harden security
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
You can access two different admin panels, for Etherpad by accessing `__DOMAIN____PATH__admin` and for MyPads by `__DOMAIN____PATH__/mypads/?/admin`.
|
||||
You can access two different admin panels, for Etherpad by accessing `__DOMAIN____PATH__/admin` and for MyPads by `__DOMAIN____PATH__/mypads/?/admin`.
|
||||
You can also find a configuration file for Etherpad at this path `__INSTALL_DIR__/settings.json`.
|
||||
|
||||
*Skin Builder* (accessible at this address `https://__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `__INSTALL_DIR__/settings.json`.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `__DOMAIN____PATH__admin` et pour MyPads par `__DOMAIN____PATH__/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `__INSTALL_DIR__/settings.json`.
|
||||
Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `__DOMAIN____PATH__/admin` et pour MyPads par `__DOMAIN____PATH__/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `__INSTALL_DIR__/settings.json`.
|
||||
|
||||
*Skin Builder* (accessible à cette adresse `https://__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `__INSTALL_DIR__/settings.json`.
|
||||
|
|
|
|||
|
|
@ -5,12 +5,7 @@ This version of Etherpad is preconfigured with a collection of plugins:
|
|||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad*
|
||||
- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment*
|
||||
- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text*
|
||||
- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.*
|
||||
- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count*
|
||||
- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited*
|
||||
- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color*
|
||||
- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size*
|
||||
- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers*
|
||||
- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown*
|
||||
- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking*
|
||||
- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript*
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,9 @@ Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers
|
|||
|
||||
Cette version d'Etherpad est préconfigurée avec une collection de plugins:
|
||||
|
||||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour etherpad*
|
||||
- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour Etherpad*
|
||||
- [ep_align](https://www.npmjs.com/package/ep_align) - *Ajout de l'alignement à gauche/centre/droit/justifié*
|
||||
- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Affichage de l'auteur lorsqu'on passe la souris au dessus d'un texte*
|
||||
- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Ajout de commentaire dans la barre latéral + lien avec le texte du pad*
|
||||
- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Ajout du compte de paragraphes, mots, caractères*
|
||||
- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Suppression des pads qui n'ont jamais été édités*
|
||||
- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Possibilité de changer la couleur de la police*
|
||||
- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Possibilité de changer la taille de la police*
|
||||
- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Possibilité de définir des titres*
|
||||
- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Editiion et export en Markdown*
|
||||
- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Ajout de la correction orthographique*
|
||||
- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices*
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
You can access two different admin panels:
|
||||
- for Etherpad by accessing https://__DOMAIN____PATH__admin
|
||||
- for MyPads (if installed) by accessing https://__DOMAIN____PATH__mypads/?/admin
|
||||
- for Etherpad by accessing https://__DOMAIN____PATH__/admin
|
||||
- for MyPads (if installed) by accessing https://__DOMAIN____PATH__/mypads/?/admin
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
Vous pouvez accéder à deux panneaux d'administration différents :
|
||||
- pour Etherpad en accédant à https://__DOMAIN____PATH__admin
|
||||
- pour MyPads (si installé) en accédant à https://__DOMAIN____PATH__mypads/?/admin
|
||||
- pour Etherpad en accédant à https://__DOMAIN____PATH__/admin
|
||||
- pour MyPads (si installé) en accédant à https://__DOMAIN____PATH__/mypads/?/admin
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ name = "Etherpad MyPads"
|
|||
description.en = "Online editor providing collaborative editing in real-time"
|
||||
description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel"
|
||||
|
||||
version = "1.9.1~ynh3"
|
||||
version = "2.1.0~ynh1"
|
||||
|
||||
maintainers = []
|
||||
|
||||
|
|
@ -20,9 +20,12 @@ code = "https://github.com/ether/etherpad-lite"
|
|||
yunohost = ">= 11.2"
|
||||
architectures = ["arm64", "amd64"]
|
||||
multi_instance = true
|
||||
|
||||
ldap = false
|
||||
|
||||
sso = false
|
||||
disk = "50M"
|
||||
|
||||
disk = "200M"
|
||||
ram.build = "1500M"
|
||||
ram.runtime = "50M"
|
||||
|
||||
|
|
@ -80,8 +83,8 @@ ram.runtime = "50M"
|
|||
[resources.sources]
|
||||
|
||||
[resources.sources.main]
|
||||
url = "https://github.com/ether/etherpad-lite/archive/1.9.1.tar.gz"
|
||||
sha256 = "667741235a2bcd8d28a32f5e611b82fb2ea7d11525ff41b8b5478b05a987b047"
|
||||
url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.1.0.tar.gz"
|
||||
sha256 = "68a238852b82088a539228fb83eb4efa6599da163e6a3214e5cf15144a50ec49"
|
||||
autoupdate.strategy = "latest_github_tag"
|
||||
|
||||
[resources.system_user]
|
||||
|
|
@ -112,4 +115,4 @@ ram.runtime = "50M"
|
|||
|
||||
[resources.database]
|
||||
type = "mysql"
|
||||
|
||||
|
||||
|
|
@ -5,24 +5,18 @@
|
|||
#=================================================
|
||||
|
||||
# NodeJS version
|
||||
nodejs_version=14
|
||||
nodejs_version=20
|
||||
|
||||
# MyPads version
|
||||
# This variable is mostly used to force an upgrade of the package in case of new versions of MyPads.
|
||||
mypads_version=1.7.24
|
||||
|
||||
# Plugin versions
|
||||
ep_align_version=0.3.53
|
||||
ep_author_hover_version=0.3.37
|
||||
ep_comments_page_version=1.0.5
|
||||
ep_countable_version=0.0.13
|
||||
# Plugin versions -> https://static.etherpad.org/index.html
|
||||
ep_align_version=0.3.95
|
||||
ep_author_hover_version=0.3.55
|
||||
ep_delete_empty_pads_version=0.0.10
|
||||
ep_font_color_version=0.0.63
|
||||
ep_headings2_version=0.2.44
|
||||
ep_markdown_version=0.1.50
|
||||
ep_spellcheck_version=0.0.43
|
||||
ep_subscript_and_superscript_version=0.2.47
|
||||
ep_font_size_version=0.4.44
|
||||
ep_headings2_version=0.2.63
|
||||
ep_font_size_version=0.4.60
|
||||
|
||||
#=================================================
|
||||
# PERSONAL HELPERS
|
||||
|
|
|
|||
|
|
@ -22,30 +22,16 @@ ynh_print_info --message="Declaring files to be backed up..."
|
|||
ynh_backup --src_path="$install_dir"
|
||||
|
||||
#=================================================
|
||||
# BACKUP THE NGINX CONFIGURATION
|
||||
# SYSTEM CONFIGURATION
|
||||
#=================================================
|
||||
|
||||
ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# BACKUP FAIL2BAN CONFIGURATION
|
||||
#=================================================
|
||||
|
||||
ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf"
|
||||
ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC BACKUP
|
||||
#=================================================
|
||||
# BACKUP LOGROTATE
|
||||
#=================================================
|
||||
|
||||
ynh_backup --src_path="/etc/logrotate.d/$app"
|
||||
|
||||
#=================================================
|
||||
# BACKUP SYSTEMD
|
||||
#=================================================
|
||||
|
||||
ynh_backup --src_path="/etc/systemd/system/$app.service"
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ ynh_change_url_nginx_config
|
|||
ynh_script_progression --message="Starting a systemd service..." --weight=10
|
||||
|
||||
# Start a systemd service
|
||||
ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
|
||||
ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="systemd"
|
||||
|
||||
#=================================================
|
||||
# DEACTIVE MAINTENANCE MODE
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ chown $app -R /var/log/$app
|
|||
#=================================================
|
||||
# ADD A CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configure etherpad..."
|
||||
ynh_script_progression --message="Configure $app..."
|
||||
|
||||
abiword_path="null"
|
||||
soffice_path="null"
|
||||
|
|
@ -80,7 +80,6 @@ then
|
|||
fi
|
||||
|
||||
# Calculate and store the config file checksum into the app settings
|
||||
|
||||
ynh_add_config --template="settings.json" --destination="$install_dir/settings.json"
|
||||
ynh_add_config --template="credentials.json" --destination="$install_dir/credentials.json"
|
||||
|
||||
|
|
@ -90,47 +89,23 @@ chown $app:$app "$install_dir/settings.json"
|
|||
chmod 600 "$install_dir/credentials.json"
|
||||
chown $app:$app "$install_dir/credentials.json"
|
||||
|
||||
#=================================================
|
||||
# INSTALL ETHERPAD'S PLUGINS
|
||||
#=================================================
|
||||
ynh_script_progression --message="Installing Etherpad plugins..." --weight=90
|
||||
|
||||
pushd "$install_dir"
|
||||
# Add Left/Center/Right/Justify to lines of text in a pad
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_align@${ep_align_version}
|
||||
# Framapad - Adds author names to span titles
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_author_hover@${ep_author_hover_version}
|
||||
# Framapad - Adds comments on sidebar and link it to the text.
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_comments_page@${ep_comments_page_version}
|
||||
# Framapad - Displays paragraphs, sentences, words and characters counts.
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_countable@${ep_countable_version}
|
||||
# Framapad - Delete pads which were never edited
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_delete_empty_pads@${ep_delete_empty_pads_version}
|
||||
# Framapad - Apply colors to fonts
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_font_color@${ep_font_color_version}
|
||||
# Framapad - Adds heading support to Etherpad Lite.
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_headings2@${ep_headings2_version}
|
||||
# Framapad - Edit and Export as Markdown in Etherpad
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_markdown@${ep_markdown_version}
|
||||
if [ $mypads -eq 1 ]; then
|
||||
# Framapad - Groups and private pads for Etherpad
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_mypads@${mypads_version}
|
||||
fi
|
||||
# Framapad - Add support to do 'Spell checking'
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_spellcheck@${ep_spellcheck_version}
|
||||
# Framapad - Add support for Subscript and Superscript
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_subscript_and_superscript@${ep_subscript_and_superscript_version}
|
||||
# Framapad - User Pad Contents font size can be set in settings, this does not effect other peoples views
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_font_size@${ep_font_size_version}
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
# INSTALL ETHERPAD
|
||||
#=================================================
|
||||
ynh_script_progression --message="Installing Etherpad..." --weight=90
|
||||
ynh_script_progression --message="Installing $app..." --weight=30
|
||||
|
||||
pushd $install_dir
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh
|
||||
pushd "$install_dir"
|
||||
ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \
|
||||
ep_align@${ep_align_version} \
|
||||
ep_author_hover@${ep_author_hover_version} \
|
||||
ep_delete_empty_pads@${ep_delete_empty_pads_version} \
|
||||
ep_headings2@${ep_headings2_version} \
|
||||
ep_font_size@${ep_font_size_version}
|
||||
if [ $mypads -eq 1 ]; then
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version}
|
||||
fi
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
|
@ -139,12 +114,12 @@ popd
|
|||
|
||||
if [ $mypads -eq 1 ]
|
||||
then
|
||||
ynh_script_progression --message="Tweaking mypad configuration..." --weight=1
|
||||
ynh_script_progression --message="Tweaking MyPads configuration..." --weight=1
|
||||
|
||||
# Add a link to Etherpad to allow anonymous pads creation from MyPads.
|
||||
ynh_replace_string --match_string="^ *\"DESCRIPTION\": .*</ul>" --replace_string="&<a href=../>Pads anonymes</a>" --target_file=$install_dir/node_modules/ep_mypads/static/l10n/fr.json
|
||||
ynh_replace_string --match_string="^ *\"DESCRIPTION\": .*</ul>" --replace_string="&<a href=../>Anonymous pads</a>" --target_file=$install_dir/node_modules/ep_mypads/static/l10n/en.json
|
||||
# And a link to etherpad admin from Mypads.
|
||||
# And a link to Etherpad admin from MyPads.
|
||||
ynh_replace_string --match_string="^ *\"FOOTER\": .*2.0" --replace_string="& | <a href='../admin'>Etherpad admin</a>" --target_file=$install_dir/node_modules/ep_mypads/static/l10n/en.json
|
||||
ynh_replace_string --match_string="^ *\"FOOTER\": .*2.0" --replace_string="& | <a href='../admin'>Etherpad admin</a>" --target_file=$install_dir/node_modules/ep_mypads/static/l10n/fr.json
|
||||
|
||||
|
|
@ -172,7 +147,7 @@ ynh_use_logrotate --specific_user=$app/$app
|
|||
ynh_script_progression --message="Starting systemd service..." --weight=20
|
||||
|
||||
# Start a systemd service
|
||||
ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
|
||||
ynh_systemd_action --service_name=$app --action=restart --log_path=systemd --line_match="Your Etherpad version is"
|
||||
|
||||
if [ $mypads -eq 1 ]
|
||||
then
|
||||
|
|
@ -180,7 +155,7 @@ then
|
|||
ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/lang_mypads.sql"
|
||||
|
||||
# Wait for etherpad to be fully started
|
||||
ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
|
||||
ynh_systemd_action --action=restart --log_path=systemd --line_match="Your Etherpad version is"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ source /usr/share/yunohost/helpers
|
|||
#=================================================
|
||||
# RESTORE THE APP MAIN DIR
|
||||
#=================================================
|
||||
#
|
||||
ynh_script_progression --message="Restoring the app main directory..." --weight=5
|
||||
|
||||
ynh_restore_file --origin_path="$install_dir"
|
||||
|
|
@ -28,7 +27,11 @@ chown $app:$app "$install_dir/credentials.json"
|
|||
ynh_script_progression --message="Restoring system configurations related to $app..."
|
||||
|
||||
ynh_install_nodejs --nodejs_version=$nodejs_version
|
||||
ynh_use_nodejs
|
||||
|
||||
pushd "$install_dir"
|
||||
ynh_use_nodejs
|
||||
ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
|
||||
popd
|
||||
|
||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
|
|
@ -62,7 +65,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
|
|||
#=================================================
|
||||
ynh_script_progression --message="Reloading NGINX web server and $app's service..."
|
||||
|
||||
ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
|
||||
ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="systemd"
|
||||
|
||||
ynh_systemd_action --action=reload --service_name=nginx
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,13 @@
|
|||
source _common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
|
||||
upgrade_type=$(ynh_check_app_version_changed)
|
||||
|
||||
#=================================================
|
||||
# ACTIVATE MAINTENANCE MODE
|
||||
#=================================================
|
||||
ynh_script_progression --message="Activating maintenance mode..." --weight=2
|
||||
|
||||
# Wait for etherpad to be fully started # (... but why ???)
|
||||
ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
|
||||
# Wait for Etherpad to be fully started # (... but why ???)
|
||||
ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="systemd"
|
||||
|
||||
ynh_maintenance_mode_ON
|
||||
|
||||
|
|
@ -67,14 +65,10 @@ ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
|
|||
#=================================================
|
||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading source files..." --weight=4
|
||||
|
||||
if [ "$upgrade_type" == "UPGRADE_APP" ]
|
||||
then
|
||||
ynh_script_progression --message="Upgrading source files..." --weight=4
|
||||
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$install_dir" --keep="settings.json credentials.json"
|
||||
fi
|
||||
# Download, check integrity, uncompress and patch the source from app.src
|
||||
ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="settings.json credentials.json"
|
||||
|
||||
chmod -R o-rwx "$install_dir"
|
||||
chown -R $app:$app "$install_dir"
|
||||
|
|
@ -87,13 +81,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=5
|
|||
ynh_install_nodejs --nodejs_version=$nodejs_version
|
||||
ynh_use_nodejs
|
||||
|
||||
#=================================================
|
||||
# NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
|
||||
|
||||
ynh_add_nginx_config
|
||||
|
||||
#=================================================
|
||||
# SPECIFIC UPGRADE
|
||||
#=================================================
|
||||
|
|
@ -107,8 +94,7 @@ chown $app -R /var/log/$app
|
|||
#=================================================
|
||||
# CONFIGURE ETHERPAD
|
||||
#=================================================
|
||||
|
||||
ynh_script_progression --message="Configure etherpad..."
|
||||
ynh_script_progression --message="Configure $app..."
|
||||
|
||||
abiword_path="null"
|
||||
soffice_path="null"
|
||||
|
|
@ -139,76 +125,42 @@ chown $app:$app "$install_dir/settings.json"
|
|||
chmod 600 "$install_dir/credentials.json"
|
||||
chown $app:$app "$install_dir/credentials.json"
|
||||
|
||||
#=================================================
|
||||
# INSTALL ETHERPAD'S PLUGINS
|
||||
#=================================================
|
||||
|
||||
# If upgrading from an old version and table of content is there, remove it
|
||||
if ynh_compare_current_package_version --comparison lt --version 1.9.1~ynh3
|
||||
then
|
||||
pushd "$install_dir"
|
||||
if ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ls 2>/dev/null | grep -q ep_table_of_contents
|
||||
then
|
||||
ynh_script_progression --message="Uninstalling ep_table_of_contents..." --weight=2
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm uninstall ep_table_of_contents
|
||||
fi
|
||||
popd
|
||||
fi
|
||||
|
||||
ynh_script_progression --message="Installing Etherpad plugins..." --weight=10
|
||||
|
||||
pushd "$install_dir"
|
||||
# Add Left/Center/Right/Justify to lines of text in a pad
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_align@${ep_align_version}
|
||||
# Framapad - Adds author names to span titles
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_author_hover@${ep_author_hover_version}
|
||||
# Framapad - Adds comments on sidebar and link it to the text.
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_comments_page@${ep_comments_page_version}
|
||||
# Framapad - Displays paragraphs, sentences, words and characters counts.
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_countable@${ep_countable_version}
|
||||
# Framapad - Delete pads which were never edited
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_delete_empty_pads@${ep_delete_empty_pads_version}
|
||||
# Framapad - Apply colors to fonts
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_font_color@${ep_font_color_version}
|
||||
# Framapad - Adds heading support to Etherpad Lite.
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_headings2@${ep_headings2_version}
|
||||
# Framapad - Edit and Export as Markdown in Etherpad
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_markdown@${ep_markdown_version}
|
||||
if [ $mypads -eq 1 ]; then
|
||||
# Framapad - Groups and private pads for Etherpad
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_mypads@${mypads_version}
|
||||
fi
|
||||
# Framapad - Add support to do 'Spell checking'
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_spellcheck@${ep_spellcheck_version}
|
||||
# Framapad - Add support for Subscript and Superscript
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_subscript_and_superscript@${ep_subscript_and_superscript_version}
|
||||
# Framapad - User Pad Contents font size can be set in settings, this does not effect other peoples views
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_font_size@${ep_font_size_version}
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
# UPGRADE NPM MODULES
|
||||
#=================================================
|
||||
ynh_script_progression --message="Upgrading Etherpad..." --weight=10
|
||||
ynh_script_progression --message="Upgrading $app..." --weight=10
|
||||
|
||||
pushd $install_dir
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh
|
||||
ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \
|
||||
ep_align@${ep_align_version} \
|
||||
ep_author_hover@${ep_author_hover_version} \
|
||||
ep_delete_empty_pads@${ep_delete_empty_pads_version} \
|
||||
ep_headings2@${ep_headings2_version} \
|
||||
ep_font_size@${ep_font_size_version}
|
||||
if [ $mypads -eq 1 ]; then
|
||||
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \
|
||||
ep_mypads@${mypads_version}
|
||||
fi
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
# ADD MYPADS LINK
|
||||
#=================================================
|
||||
|
||||
if [ "$upgrade_type" == "UPGRADE_APP" ] && [ $mypads -eq 1 ]
|
||||
if [ $mypads -eq 1 ]
|
||||
then
|
||||
# Find the /div just after the field to open a pad in order to add a link to MyPads plugin.
|
||||
sed -i '157i<center><br><font size="4"><a href="./mypads/" style="text-decoration: none; color: #555">MyPads</a></font></center>' $install_dir/src/templates/index.html
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# SETUP SYSTEMD
|
||||
# REAPPLY SYSTEM CONFIGURATIONS
|
||||
#=================================================
|
||||
ynh_script_progression --message="Configuring systemd service..." --weight=2
|
||||
ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
|
||||
|
||||
ynh_add_nginx_config
|
||||
|
||||
ynh_add_systemd_config
|
||||
|
||||
|
|
@ -223,7 +175,7 @@ ynh_use_logrotate --non-append --specific_user=$app/$app
|
|||
#=================================================
|
||||
ynh_script_progression --message="Starting systemd service..." --weight=9
|
||||
|
||||
ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
|
||||
ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="systemd"
|
||||
|
||||
#=================================================
|
||||
# UPGRADE FAIL2BAN
|
||||
|
|
|
|||
|
|
@ -17,22 +17,22 @@ test_format = 1.0
|
|||
# Commits to test upgrade from
|
||||
# -------------------------------
|
||||
|
||||
test_upgrade_from.4d613658.name = "1.8.17"
|
||||
test_upgrade_from.4e8049b31708b9f0223ee1a6ca8f153f04ec7e40.name = "1.9.1"
|
||||
|
||||
|
||||
[with_mypads]
|
||||
[with_MyPads]
|
||||
args.export = "libreoffice"
|
||||
args.mypads = 1
|
||||
args.useldap = 1
|
||||
only = ["install.root"]
|
||||
|
||||
[with_abiword]
|
||||
[with_Abiword]
|
||||
args.export = "abiword"
|
||||
args.mypads = 0
|
||||
args.useldap = 0
|
||||
only = ["install.root"]
|
||||
|
||||
[with_libreoffice]
|
||||
[with_Libreoffice]
|
||||
args.export = "libreoffice"
|
||||
args.mypads = 0
|
||||
args.useldap = 0
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue