diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cbdcf2..2211760 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,18 @@ Changelog ========= +## [1.8.14~ynh1]() - 2021-06-04 + +#### Changed +* [Upgrade to 1.8.14](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/452b42c106f9e67f84165e1f62ba7cc516240351) +* [Update to MyPads 1.7.21](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/678da97ecac67491028cdeba1493ba11650b992b) +* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/commit/34d5d0a002c3ca74c8151d365efaaba0e6fb96b2) + ## [1.8.13~ynh2]() - 2021-05-14 #### Disabled * [ep_automatic_logut plugin](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/140/files) - ## [1.8.13~ynh1]() - 2021-03-23 #### Changed @@ -42,7 +48,7 @@ Changelog * [Add changelog](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/76) #### Fixed -- [Show a link to mypads only if installed](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/74/commits/46b50b32e58edfb74c143fe5a50362629294f50b) +* [Show a link to mypads only if installed](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/74/commits/46b50b32e58edfb74c143fe5a50362629294f50b) #### Changed * [Upgrade to 1.8.0](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/78) @@ -61,19 +67,19 @@ Changelog - [Progress bar](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/4489e07a059477802cfeb402e1980b79e1ddce97) #### Fixed -- [Fix regression on ynh_system_user_create](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/c0de9b2ee3ebc5ecb11e02655984e1fe793dd9d5) +* [Fix regression on ynh_system_user_create](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/c0de9b2ee3ebc5ecb11e02655984e1fe793dd9d5) #### Changed -- [Update to last standart](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/c663ec74c1d97cccbc1291a9d3e74cdf3b7586e9) +* [Update to last standart](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/c663ec74c1d97cccbc1291a9d3e74cdf3b7586e9) * [Update to mypads 1.7.6](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/c87caaad6507a52a71572ef21529cc4f1022b53b) -- [Update helpers](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/bab779a39f3f6f45c0fcc6bdf640baa47a5e6821) -- [Allow to include a pad in an other page](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/f27cca79957f88fd9972452db146fe6867ba3f79) +* [Update helpers](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/bab779a39f3f6f45c0fcc6bdf640baa47a5e6821) +* [Allow to include a pad in an other page](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/63/commits/f27cca79957f88fd9972452db146fe6867ba3f79) ## [1.7.0~ynh1](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/55) - 2018-12-08 #### Fixed -- [Set permissions during the restore script](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/55/commits/85be69b5ce15db0d9df0f0ca191be43c2ea6bc31) +* [Set permissions during the restore script](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/55/commits/85be69b5ce15db0d9df0f0ca191be43c2ea6bc31) #### Changed * [Update mypads to 1.6.8](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/55/commits/8c73fd242286029991b774d02ce9209c88793c21) diff --git a/README.md b/README.md index 99de54d..33df9ef 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,31 @@ -# Etherpad with MyPads plugin for YunoHost + -[![Integration level](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) [![](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg)](https://github.com/YunoHost/Apps/#what-to-do-if-i-cant-maintain-my-app-anymore-) -[![Install Etherpad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) +# Etherpad MyPads for YunoHost + +[![Integration level](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) +[![Install Etherpad MyPads with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install Etherpad quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* +> *This package allows you to install Etherpad MyPads quickly and simply on a YunoHost server. +If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -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.8.13 +Online editor providing collaborative editing in real-time + +**Shipped version:** 1.8.14~ynh1 + +**Demo:** https://video.etherpad.com ## Screenshots -![](https://github.com/ether/etherpad-lite/blob/develop/doc/images/etherpad_demo.gif) +![](./doc/screenshots/etherpad_demo.gif) -## Demo - -* [Official demo](https://video.etherpad.com/) +## Disclaimers / important information ## Configuration @@ -29,11 +34,6 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether *Skin Builder* (accessible at this address `domain.tld/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 `/var/www/etherpad_mypads/settings.json`. -## Documentation - - * Official documentation: http://etherpad.org/doc/v1.8.13 - * YunoHost documentation: https://yunohost.org/en/app_etherpad_mypads - ## YunoHost specific features #### Multi-users support @@ -41,13 +41,6 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether * Is LDAP auth supported (for MyPads access only)? **Yes** * Can the app be used by multiple users? **Yes** -#### Supported architectures - -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad_mypads.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/) - -## Limitations - ## Additionnal informations * This package will install the following plugins: @@ -66,19 +59,18 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether * [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Add support for Subscript and Superscript* * [ep_table_of_contents](https://www.npmjs.com/package/ep_table_of_contents) - *View a table of contents for your pad* -## Links +## Documentation and resources - * Report a bug: https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues - * Etherpad website: http://etherpad.org/ - * MyPads plugin website: https://git.framasoft.org/framasoft/ep_mypads - * Upstream app repository: https://github.com/ether/etherpad-lite - * YunoHost website: https://yunohost.org/ +* Official app website: http://etherpad.org +* Official user documentation: https://yunohost.org/en/app_etherpad_mypads +* Official admin documentation: http://etherpad.org/doc/v1.8.14 +* Upstream app code repository: https://github.com/ether/etherpad-lite +* YunoHost documentation for this app: https://yunohost.org/app_etherpad_mypads +* Report a bug: https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues ---- +## Developer info -## Developers infos - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing). To try the testing branch, please proceed like that. ``` @@ -86,3 +78,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/t or sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index ba99ff8..343e1b8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,26 +1,27 @@ -# Etherpad avec plugin MyPads pour YunoHost +# Etherpad MyPads pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) [![](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg)](https://github.com/YunoHost/Apps/#what-to-do-if-i-cant-maintain-my-app-anymore-) -[![Installer Etherpad avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) +[![Niveau d'intégration](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) +[![Installer Etherpad MyPads avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) *[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* -> *Ce package vous permet d'installer Etherpad rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/install_fr) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d'installer Etherpad MyPads rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* -## Résumé -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/). +## Vue d'ensemble -**Version embarquée :** 1.8.13 +Éditeur en ligne fournissant l'édition collaborative en temps réel + +**Version incluse :** 1.8.14~ynh1 + +**Démo :** https://video.etherpad.com ## Captures d'écran -![](https://github.com/ether/etherpad-lite/blob/develop/doc/images/etherpad_demo.gif) +![](./doc/screenshots/etherpad_demo.gif) -## Démo - -* [Démo officielle](https://video.etherpad.com/) +## Avertissements / informations importantes ## Configuration @@ -28,11 +29,6 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa *Skin Builder* (accessible à cette adresse `domain.tld/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 `/var/www/etherpad_mypads/settings.json`. -## Documentation - - * Documentation officielle : http://etherpad.org/doc/v1.8.13 - * Documentation YunoHost : https://yunohost.org/fr/app_etherpad_mypads - ## Fonctionnalités spécifiques à YunoHost #### Support multi-utilisateurs @@ -40,11 +36,6 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa * L'authentification LDAP est-elle prise en charge (pour l'accès MyPads uniquement) ? **Oui** * L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** -#### Architectures supportées - -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad_mypads.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/) - ## Limitations ## Informations additionnelles @@ -65,23 +56,24 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa * [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Ajouter la prise en charge de Subscript et Superscript*. * [ep_table_of_contents](https://www.npmjs.com/package/ep_table_of_contents) - *Voir une table des matières pour votre pad* -## Liens +## Documentations et ressources - * Reporter un bug : https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues - * Site d'Etherpad : http://etherpad.org/ - * Site du plugin MyPads : https://git.framasoft.org/framasoft/ep_mypads - * Dépôt GitHub de l'application : https://github.com/ether/etherpad-lite - * Site de YunoHost : https://yunohost.org/ +* Site officiel de l'app : http://etherpad.org +* Documentation officielle utilisateur : https://yunohost.org/en/app_etherpad_mypads +* Documentation officielle de l'admin : http://etherpad.org/doc/v1.8.14 +* Dépôt de code officiel de l'app : https://github.com/ether/etherpad-lite +* Documentation YunoHost pour cette app : https://yunohost.org/app_etherpad_mypads +* Signaler un bug : https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues ---- - -## Informations à l'intention des développeurs +## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing). -Pour tester la branche testing, merci de procéder ainsi. +Pour essayer la branche testing, procédez comme suit. ``` 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 --debug ``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/check_process b/check_process index ea0c788..91c1924 100644 --- a/check_process +++ b/check_process @@ -1,11 +1,11 @@ ;; Test complet avec LibreOffice et MyPads ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) + domain="domain.tld" + path="/path" + admin="john" password="password" language="en" - is_public=1 (PUBLIC|public=1|private=0) + is_public=1 export="libreoffice" mypads=1 useldap=1 @@ -39,12 +39,12 @@ config_panel=0 ;; Test sans MyPads ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) + domain="domain.tld" + path="/path" + admin="john" password="password" language="en" - is_public=1 (PUBLIC|public=1|private=0) + is_public=1 export="libreoffice" mypads=0 useldap=0 @@ -55,12 +55,12 @@ backup_restore=1 ;; Test Abiword ; Manifest - domain="domain.tld" (DOMAIN) - path="/" (PATH) - admin="john" (USER) + domain="domain.tld" + path="/" + admin="john" password="password" language="en" - is_public=1 (PUBLIC|public=1|private=0) + is_public=1 export="abiword" mypads=1 useldap=0 @@ -69,12 +69,12 @@ upgrade=1 from_commit=978e77403a6d8e9512ec1f5203e9834e945c2d8c ;; Test sans export ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) + domain="domain.tld" + path="/path" + admin="john" password="password" language="en" - is_public=1 (PUBLIC|public=1|private=0) + is_public=1 export="none" mypads=1 useldap=0 diff --git a/conf/app.src b/conf/app.src index 2c28073..3df6ff5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.13.tar.gz -SOURCE_SUM=c83052daf3b0af8aa3c19a8308e21fcbcfecca99aeb3e8047383875f855443f1 +SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.14.tar.gz +SOURCE_SUM=5404035675fb5ee9349d42927895bb3933590823612ebe31ca4cc523afdac49e SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/settings.json b/conf/settings.json index 6a8c1b6..cdff7e4 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -15,6 +15,31 @@ * * This is useful, for example, when running in a Docker container. * + * DETAILED RULES: + * - If the environment variable is set to the string "true" or "false", the + * value becomes Boolean true or false. + * - If the environment variable is set to the string "null", the value + * becomes null. + * - If the environment variable is set to the string "undefined", the setting + * is removed entirely, except when used as the member of an array in which + * case it becomes null. + * - If the environment variable is set to a string representation of a finite + * number, the string is converted to that number. + * - If the environment variable is set to any other string, including the + * empty string, the value is that string. + * - If the environment variable is unset and a default value is provided, the + * value is as if the environment variable was set to the provided default: + * - "${UNSET_VAR:}" becomes the empty string. + * - "${UNSET_VAR:foo}" becomes the string "foo". + * - "${UNSET_VAR:true}" and "${UNSET_VAR:false}" become true and false. + * - "${UNSET_VAR:null}" becomes null. + * - "${UNSET_VAR:undefined}" causes the setting to be removed (or be set + * to null, if used as a member of an array). + * - If the environment variable is unset and no default value is provided, + * the value becomes null. THIS BEHAVIOR MAY CHANGE IN A FUTURE VERSION OF + * ETHERPAD; if you want the default value to be null, you should explicitly + * specify "null" as the default value. + * * EXAMPLE: * "port": "${PORT:9001}" * "minify": "${MINIFY}" diff --git a/conf/systemd.service b/conf/systemd.service index f2a54ed..8b27b8c 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -14,11 +14,5 @@ StandardOutput=append:/var/log/__APP__/etherpad.log StandardError=inherit Restart=always -#PrivateDevices=true -#ProtectControlGroups=true -#ProtectHome=true -#ProtectKernelTunables=true -#ProtectSystem=full - [Install] WantedBy=multi-user.target diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..fe39275 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,31 @@ +## Configuration + +You can access two different admin panels, for Etherpad by accessing `domain.tld/admin` and for MyPads by `domain.tld/mypads/?/admin`. +You can also find a configuration file for Etherpad at this path `/var/www/etherpad_mypads/settings.json`. + +*Skin Builder* (accessible at this address `domain.tld/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 `/var/www/etherpad_mypads/settings.json`. + +## YunoHost specific features + +#### Multi-users support + + * Is LDAP auth supported (for MyPads access only)? **Yes** + * Can the app be used by multiple users? **Yes** + +## Additionnal informations + +* This package will install the following plugins: + + * [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify to lines of text in a pad* + * [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Adds author names to span titles* + * [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Adds comments on sidebar and link it to the text.* + * [ep_countable](https://www.npmjs.com/package/ep_countable) - *Adds 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) - *Apply colors to fonts* + * [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Add support for Font Sizes* + * [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Adds heading support to Etherpad Lite.* + * [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and Export as Markdown in Etherpad* + * [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* + * [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add support to do 'Spell checking'* + * [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Add support for Subscript and Superscript* + * [ep_table_of_contents](https://www.npmjs.com/package/ep_table_of_contents) - *View a table of contents for your pad* diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..f2fc4e4 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,32 @@ +## Configuration + +Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `domain.tld/admin` et pour MyPads par `domain.tld/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `/var/www/etherpad_mypads/settings.json`. + +*Skin Builder* (accessible à cette adresse `domain.tld/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 `/var/www/etherpad_mypads/settings.json`. + +## Fonctionnalités spécifiques à YunoHost + +#### Support multi-utilisateurs + + * L'authentification LDAP est-elle prise en charge (pour l'accès MyPads uniquement) ? **Oui** + * L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** + +## Limitations + +## Informations additionnelles + +* Ce paquet installera les plugins suivants : + + * [ep_align](https://www.npmjs.com/package/ep_align) - *Ajoute Gauche/Centre/Droite/Justifier à des lignes de texte dans un pad* + * [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Ajoute des noms d'auteurs* + * [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Ajoute des commentaires sur la sidebar et le lie au texte.* + * [ep_countable](https://www.npmjs.com/package/ep_countable) - *Ajoute l'afficher le nombre de paragraphes, de mots et de caractères* + * [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Supprimer les pads qui n'ont jamais été édités* + * [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Appliquer les couleurs aux polices de caractères* + * [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Permet de définir la taille de la police*. + * [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Ajoute le support de titre à Etherpad Lite.* + * [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Modifier et exporter en tant que Markdown dans Etherpad* + * [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour etherpad* + * [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Ajouter le support pour faire de la vérification orthographique* + * [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Ajouter la prise en charge de Subscript et Superscript*. + * [ep_table_of_contents](https://www.npmjs.com/package/ep_table_of_contents) - *Voir une table des matières pour votre pad* diff --git a/doc/screenshots/etherpad_demo.gif b/doc/screenshots/etherpad_demo.gif new file mode 100644 index 0000000..2fa8464 Binary files /dev/null and b/doc/screenshots/etherpad_demo.gif differ diff --git a/manifest.json b/manifest.json index abac826..c2afcbd 100644 --- a/manifest.json +++ b/manifest.json @@ -3,11 +3,19 @@ "id": "etherpad_mypads", "packaging_format": 1, "description": { - "en": "Online editor providing collaborative editing in real-time.", - "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel." + "en": "Online editor providing collaborative editing in real-time", + "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel" }, - "version": "1.8.13~ynh2", - "url": "https://framapad.org", + "version": "1.8.14~ynh1", + "url": "http://etherpad.org", + "upstream": { + "license": "Apache-2.0", + "website": "http://etherpad.org", + "demo": "https://video.etherpad.com", + "admindoc": "http://etherpad.org/doc/v1.8.14", + "userdoc": "https://yunohost.org/en/app_etherpad_mypads", + "code": "https://github.com/ether/etherpad-lite" + }, "license": "Apache-2.0", "maintainer": { "name": "", @@ -18,7 +26,7 @@ "email": "maniackc_dev@crudelis.fr" }], "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.4" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index dd120b1..abc4bcc 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,5 +1,39 @@ #!/bin/bash +#================================================= +# COMMON VARIABLES +#================================================= + +#!/bin/bash + +# Dependencies for AbiWord +abiword_app_depencencies="abiword" + +# Dependencies for LibreOffice +libreoffice_app_dependencies="unoconv libreoffice-writer" + +# NodeJS version +nodejs_version=14 + +# 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.21 + +# Plugin versions +ep_align_version=0.3.34 +ep_author_hover_version=0.3.21 +ep_comments_page_version=0.1.63 +ep_countable_version=0.0.11 +ep_delete_empty_pads_version=0.0.7 +ep_font_color_version=0.0.45 +ep_headings2_version=0.2.30 +ep_markdown_version=0.1.36 +ep_page_view_version=0.5.24 +ep_spellcheck_version=0.0.28 +ep_subscript_and_superscript_version=0.2.30 +ep_table_of_contents_version=0.3.22 +ep_font_size_version=0.4.25 + #================================================= # PERSONAL HELPERS #================================================= @@ -369,18 +403,3 @@ ynh_app_changelog () { echo "No significative changes from the changelog..." > "${final_changelog}_lite" fi } - -#================================================= - -# Execute a command as another user -# usage: ynh_exec_as USER COMMAND [ARG ...] -ynh_exec_as() { - local USER=$1 - shift 1 - - if [[ $USER = $(whoami) ]]; then - eval "$@" - else - sudo -u "$USER" "$@" - fi -} diff --git a/scripts/_variables b/scripts/_variables deleted file mode 100644 index ffb16a7..0000000 --- a/scripts/_variables +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# Dependencies for AbiWord -abiword_app_depencencies="abiword" - -# Dependencies for LibreOffice -libreoffice_app_dependencies="unoconv libreoffice-writer" - -# NodeJS version -nodejs_version=14 - -# 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.20 - -# Plugin versions -ep_align_version=0.3.34 -ep_author_hover_version=0.3.19 -ep_comments_page_version=0.1.60 -ep_countable_version=0.0.11 -ep_delete_empty_pads_version=0.0.7 -ep_font_color_version=0.0.42 -ep_headings2_version=0.2.28 -ep_markdown_version=0.1.32 -ep_page_view_version=0.5.24 -ep_spellcheck_version=0.0.27 -ep_subscript_and_superscript_version=0.2.26 -ep_table_of_contents_version=0.3.20 -ep_font_size_version=0.4.22 diff --git a/scripts/actions/add_remove_abiword b/scripts/actions/add_remove_abiword index 771434a..28fb0ea 100755 --- a/scripts/actions/add_remove_abiword +++ b/scripts/actions/add_remove_abiword @@ -67,9 +67,6 @@ fi ynh_script_progression --message="$action2 AbiWord..." --weight=3 -# Load common variables, and especially Abiword dependencies. -source scripts/_variables - dependencies="" if [ $abiword -eq 1 ] then diff --git a/scripts/actions/add_remove_libreoffice b/scripts/actions/add_remove_libreoffice index 19d5788..9acfb46 100755 --- a/scripts/actions/add_remove_libreoffice +++ b/scripts/actions/add_remove_libreoffice @@ -67,9 +67,6 @@ fi ynh_script_progression --message="$action2 LibreOffice..." --weight=3 -# Load common variables, and especially LibreOffice dependencies. -source scripts/_variables - dependencies="" if [ $libreoffice -eq 1 ] then diff --git a/scripts/backup b/scripts/backup index a446a3e..3166fda 100644 --- a/scripts/backup +++ b/scripts/backup @@ -6,6 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -39,7 +40,7 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$final_path" #================================================= -# BACKUP NGINX CONFIGURATION +# BACKUP THE NGINX CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/change_url b/scripts/change_url index e561950..5db8dbf 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -31,17 +31,19 @@ mypads=$(ynh_app_setting_get --app=$app --key=mypads) port=$(ynh_app_setting_get --app=$app --key=port) #================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=40 # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { + # Clean installation remainings that are not handled by the remove script. + ynh_clean_check_starting # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script @@ -72,17 +74,6 @@ then change_path=1 fi -#================================================= -# MANAGE FAILURE OF THE SCRIPT -#================================================= - -ynh_clean_setup () { -# Clean installation remainings that are not handled by the remove script. - ynh_clean_check_starting -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - #================================================= # STANDARD MODIFICATIONS #================================================= diff --git a/scripts/install b/scripts/install index 966bb0a..fef4106 100644 --- a/scripts/install +++ b/scripts/install @@ -11,7 +11,6 @@ if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then fi # Load common variables for all scripts. -source _variables source _common.sh source /usr/share/yunohost/helpers @@ -43,7 +42,7 @@ useldap=$YNH_APP_ARG_USELDAP app=$YNH_APP_INSTANCE_NAME #================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THIS ARGS +# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= ynh_script_progression --message="Validating installation parameters..." @@ -55,7 +54,7 @@ fi ynh_print_ON final_path=/var/www/$app -test ! -e "$final_path" || ynh_die "This path already contains a folder" +test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -85,7 +84,7 @@ ynh_app_setting_set --app=$app --key=overwrite_systemd --value="1" #================================================= ynh_script_progression --message="Finding an available port..." --weight=2 -# Find a free port +# Find an available port port=$(ynh_find_port --port=9001) ynh_app_setting_set --app=$app --key=port --value=$port @@ -203,16 +202,17 @@ fi ynh_store_file_checksum --file="$final_path/settings.json" ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json" +# Restrict access to credentials.json +chmod 600 $final_path/credentials.json #================================================= # SECURING FILES AND DIRECTORIES #================================================= # Set files ownership to etherpad -chown -R $app:$app $final_path -chmod o-rwx $final_path -# Restrict access to credentials.json -chmod 600 $final_path/credentials.json +chmod 750 "$final_path" +chmod o-rwx "$final_path" +chown -R $app: "$final_path" #================================================= # SETUP SYSTEMD @@ -220,7 +220,7 @@ chmod 600 $final_path/credentials.json ynh_script_progression --message="Configuring a systemd service..." --weight=4 # Create a dedicated systemd config -ynh_add_systemd_config --others_var="ynh_node_load_PATH" +ynh_add_systemd_config #================================================= # ADVERTISE SERVICE IN ADMIN PANEL @@ -234,37 +234,41 @@ yunohost service add $app --description="Collaborative editor" --log="/var/log/$ ynh_script_progression --message="Installing Etherpad plugins..." --weight=90 pushd "$final_path" -# Add Left/Center/Right/Justify to lines of text in a pad -ynh_npm install ep_align@${ep_align_version} >> $install_log 2>&1 -# Framapad - Adds author names to span titles -ynh_npm install ep_author_hover@${ep_author_hover_version} >> $install_log 2>&1 -# Framapad - Adds comments on sidebar and link it to the text. -ynh_npm install ep_comments_page@${ep_comments_page_version} >> $install_log 2>&1 -# Framapad - Displays paragraphs, sentences, words and characters counts. -ynh_npm install ep_countable@${ep_countable_version} >> $install_log 2>&1 -# Framapad - Delete pads which were never edited -ynh_npm install ep_delete_empty_pads@${ep_delete_empty_pads_version} >> $install_log 2>&1 -# Framapad - Apply colors to fonts -ynh_npm install ep_font_color@${ep_font_color_version} >> $install_log 2>&1 -# Framapad - Adds heading support to Etherpad Lite. -ynh_npm install ep_headings2@${ep_headings2_version} >> $install_log 2>&1 -# Framapad - Edit and Export as Markdown in Etherpad -ynh_npm install ep_markdown@${ep_markdown_version} >> $install_log 2>&1 -if [ $mypads -eq 1 ]; then - # Framapad - Groups and private pads for Etherpad - ynh_npm install ep_mypads@${mypads_version} >> $install_log 2>&1 -fi -# Framapad - Add support to do 'Spell checking' -ynh_npm install ep_spellcheck@${ep_spellcheck_version} >> $install_log 2>&1 -# Framapad - Add support for Subscript and Superscript -ynh_npm install ep_subscript_and_superscript@${ep_subscript_and_superscript_version} >> $install_log 2>&1 -# Framapad - View a table of contents for your pad -ynh_npm install ep_table_of_contents@${ep_table_of_contents_version} >> $install_log 2>&1 -# Framapad - User Pad Contents font size can be set in settings, this does not effect other peoples views -ynh_npm install ep_font_size@${ep_font_size_version} >> $install_log 2>&1 + # Add Left/Center/Right/Justify to lines of text in a pad + ynh_npm install ep_align@${ep_align_version} >> $install_log 2>&1 + # Framapad - Adds author names to span titles + ynh_npm install ep_author_hover@${ep_author_hover_version} >> $install_log 2>&1 + # Framapad - Adds comments on sidebar and link it to the text. + ynh_npm install ep_comments_page@${ep_comments_page_version} >> $install_log 2>&1 + # Framapad - Displays paragraphs, sentences, words and characters counts. + ynh_npm install ep_countable@${ep_countable_version} >> $install_log 2>&1 + # Framapad - Delete pads which were never edited + ynh_npm install ep_delete_empty_pads@${ep_delete_empty_pads_version} >> $install_log 2>&1 + # Framapad - Apply colors to fonts + ynh_npm install ep_font_color@${ep_font_color_version} >> $install_log 2>&1 + # Framapad - Adds heading support to Etherpad Lite. + ynh_npm install ep_headings2@${ep_headings2_version} >> $install_log 2>&1 + # Framapad - Edit and Export as Markdown in Etherpad + ynh_npm install ep_markdown@${ep_markdown_version} >> $install_log 2>&1 + if [ $mypads -eq 1 ]; then + # Framapad - Groups and private pads for Etherpad + ynh_npm install ep_mypads@${mypads_version} >> $install_log 2>&1 + fi + # Framapad - Add support to do 'Spell checking' + ynh_npm install ep_spellcheck@${ep_spellcheck_version} >> $install_log 2>&1 + # Framapad - Add support for Subscript and Superscript + ynh_npm install ep_subscript_and_superscript@${ep_subscript_and_superscript_version} >> $install_log 2>&1 + # Framapad - View a table of contents for your pad + ynh_npm install ep_table_of_contents@${ep_table_of_contents_version} >> $install_log 2>&1 + # Framapad - User Pad Contents font size can be set in settings, this does not effect other peoples views + ynh_npm install ep_font_size@${ep_font_size_version} >> $install_log 2>&1 popd + chown -R $app: $final_path/node_modules +# Remove package-lock.json otherwise plugins installation and upgrade fails miserablywith 502 error +ynh_secure_remove --file="$final_path/package-lock.json" + #================================================= # SOME HACKS #================================================= @@ -299,7 +303,7 @@ if [ $is_public -eq 1 ]; then ynh_permission_update --permission="main" --add="visitors" fi -# Etherpad admin page doesn't support SSO... +# Only the admin can access the admin panel of the app (if the app has an admin panel) ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin #================================================= diff --git a/scripts/remove b/scripts/remove index d5957c8..7fb3266 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,7 +1,7 @@ #!/bin/bash #================================================= -# GENERIC STARTING +# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -17,6 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=3 app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) db_name=$(ynh_app_setting_get --app=$app --key=db_name) export=$(ynh_app_setting_get --app=$app --key=export) @@ -24,13 +25,13 @@ export=$(ynh_app_setting_get --app=$app --key=export) #================================================= # STANDARD REMOVE #================================================= -# REMOVE SERVICE FROM ADMIN PANEL +# REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= -# Remove a service from the admin panel, added by `yunohost service add` -if ynh_exec_fully_quiet yunohost service status $app +# Remove the service from the list of services known, YunoHost (added from `yunohost service add`) +if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service..." + ynh_script_progression --message="Removing $app service integration..." yunohost service remove $app fi @@ -71,10 +72,10 @@ ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing Etherpad main directory..." +ynh_script_progression --message="Removing the app main directory..." # Remove the app directory securely -ynh_secure_remove --file="/var/www/$app" +ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION @@ -89,6 +90,8 @@ ynh_remove_nginx_config #================================================= ynh_script_progression --message="Removing logrotate configuration..." +ynh_secure_remove --file="/var/log/$app" + # Remove the app-specific logrotate config ynh_remove_logrotate @@ -107,7 +110,7 @@ ynh_remove_fail2ban_config #================================================= ynh_script_progression --message="Removing the dedicated system user..." --weight=2 -# Delete dedicated system user +# Delete a system user ynh_system_user_delete --username=$app #================================================= diff --git a/scripts/restore b/scripts/restore index 49073ed..e7ee13c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,9 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -# Load common variables for all scripts. -source ../settings/scripts/_variables - +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -17,7 +15,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { -# Clean installation remainings that are not handled by the remove script. + # Clean installation remainings that are not handled by the remove script. ynh_clean_check_starting } # Exit if an error occurs during the execution of the script @@ -57,7 +55,7 @@ ynh_script_progression --message="Activating maintenance mode..." --weight=2 ynh_maintenance_mode_ON #================================================= -# STANDARD RESTORE STEPS +# STANDARD RESTORATION STEPS #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= @@ -135,8 +133,9 @@ ynh_exec_warn_less npm cache clean --force #================================================= # Restore permissions on app files -chown -R $app: $final_path -chmod o-rwx $final_path +chmod 750 "$final_path" +chmod o-rwx "$final_path" +chown -R $app: "$final_path" #================================================= # ADVERTISE SERVICE IN ADMIN PANEL diff --git a/scripts/upgrade b/scripts/upgrade index 4f29416..dfe4f87 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,7 +7,6 @@ #================================================= # Load common variables for all scripts. -source _variables source _common.sh source /usr/share/yunohost/helpers @@ -105,25 +104,25 @@ fi # If overwrite_settings doesn't exist, create it if [ -z "$overwrite_settings" ]; then overwrite_settings=1 - ynh_app_setting_set $app overwrite_settings $overwrite_settings + ynh_app_setting_set --app=$app --key=overwrite_settings --value=$overwrite_settings fi # If overwrite_credentials doesn't exist, create it if [ -z "$overwrite_credentials" ]; then overwrite_credentials=1 - ynh_app_setting_set $app overwrite_credentials $overwrite_credentials + ynh_app_setting_set --app=$app --key=overwrite_credentials --value=$overwrite_credentials fi # If overwrite_nginx doesn't exist, create it if [ -z "$overwrite_nginx" ]; then overwrite_nginx=1 - ynh_app_setting_set $app overwrite_nginx $overwrite_nginx + ynh_app_setting_set --app=$app --key=overwrite_nginx --value=$overwrite_nginx fi # If overwrite_systemd doesn't exist, create it if [ -z "$overwrite_systemd" ]; then overwrite_systemd=1 - ynh_app_setting_set $app overwrite_systemd $overwrite_systemd + ynh_app_setting_set --app=$app --key=overwrite_systemd --value=$overwrite_systemd fi # Cleaning legacy permissions @@ -284,37 +283,41 @@ popd ynh_script_progression --message="Installing Etherpad plugins..." --weight=90 pushd "$final_path" -# Add Left/Center/Right/Justify to lines of text in a pad -ynh_npm install ep_align@${ep_align_version} >> $install_log 2>&1 -# Framapad - Adds author names to span titles -ynh_npm install ep_author_hover@${ep_author_hover_version} >> $install_log 2>&1 -# Framapad - Adds comments on sidebar and link it to the text. -ynh_npm install ep_comments_page@${ep_comments_page_version} >> $install_log 2>&1 -# Framapad - Displays paragraphs, sentences, words and characters counts. -ynh_npm install ep_countable@${ep_countable_version} >> $install_log 2>&1 -# Framapad - Delete pads which were never edited -ynh_npm install ep_delete_empty_pads@${ep_delete_empty_pads_version} >> $install_log 2>&1 -# Framapad - Apply colors to fonts -ynh_npm install ep_font_color@${ep_font_color_version} >> $install_log 2>&1 -# Framapad - Adds heading support to Etherpad Lite. -ynh_npm install ep_headings2@${ep_headings2_version} >> $install_log 2>&1 -# Framapad - Edit and Export as Markdown in Etherpad -ynh_npm install ep_markdown@${ep_markdown_version} >> $install_log 2>&1 -if [ $mypads -eq 1 ]; then - # Framapad - Groups and private pads for etherpad - ynh_npm install ep_mypads@${mypads_version} >> $install_log 2>&1 -fi -# Framapad - Add support to do 'Spell checking' -ynh_npm install ep_spellcheck@${ep_spellcheck_version} >> $install_log 2>&1 -# Framapad - Add support for Subscript and Superscript -ynh_npm install ep_subscript_and_superscript@${ep_subscript_and_superscript_version} >> $install_log 2>&1 -# Framapad - View a table of contents for your pad -ynh_npm install ep_table_of_contents@${ep_table_of_contents_version} >> $install_log 2>&1 -# Framapad - User Pad Contents font size can be set in settings, this does not effect other peoples views -ynh_npm install ep_font_size@${ep_font_size_version} >> $install_log 2>&1 + # Add Left/Center/Right/Justify to lines of text in a pad + ynh_npm install ep_align@${ep_align_version} >> $install_log 2>&1 + # Framapad - Adds author names to span titles + ynh_npm install ep_author_hover@${ep_author_hover_version} >> $install_log 2>&1 + # Framapad - Adds comments on sidebar and link it to the text. + ynh_npm install ep_comments_page@${ep_comments_page_version} >> $install_log 2>&1 + # Framapad - Displays paragraphs, sentences, words and characters counts. + ynh_npm install ep_countable@${ep_countable_version} >> $install_log 2>&1 + # Framapad - Delete pads which were never edited + ynh_npm install ep_delete_empty_pads@${ep_delete_empty_pads_version} >> $install_log 2>&1 + # Framapad - Apply colors to fonts + ynh_npm install ep_font_color@${ep_font_color_version} >> $install_log 2>&1 + # Framapad - Adds heading support to Etherpad Lite. + ynh_npm install ep_headings2@${ep_headings2_version} >> $install_log 2>&1 + # Framapad - Edit and Export as Markdown in Etherpad + ynh_npm install ep_markdown@${ep_markdown_version} >> $install_log 2>&1 + if [ $mypads -eq 1 ]; then + # Framapad - Groups and private pads for etherpad + ynh_npm install ep_mypads@${mypads_version} >> $install_log 2>&1 + fi + # Framapad - Add support to do 'Spell checking' + ynh_npm install ep_spellcheck@${ep_spellcheck_version} >> $install_log 2>&1 + # Framapad - Add support for Subscript and Superscript + ynh_npm install ep_subscript_and_superscript@${ep_subscript_and_superscript_version} >> $install_log 2>&1 + # Framapad - View a table of contents for your pad + ynh_npm install ep_table_of_contents@${ep_table_of_contents_version} >> $install_log 2>&1 + # Framapad - User Pad Contents font size can be set in settings, this does not effect other peoples views + ynh_npm install ep_font_size@${ep_font_size_version} >> $install_log 2>&1 popd + chown -R $app: $final_path/node_modules +# Remove package-lock.json otherwise plugins installation and upgrade fails miserablywith 502 error +ynh_secure_remove --file="$final_path/package-lock.json" + #================================================= # SPECIFIC UPGRADE #================================================= @@ -393,8 +396,9 @@ fi #================================================= # Set files ownership to Etherpad -chown -R $app: $final_path -chmod o-rwx $final_path +chmod 750 "$final_path" +chmod o-rwx "$final_path" +chown -R $app: "$final_path" # Restrict access to credentials.json chmod 600 "$final_path/credentials.json" chown $app -R /var/log/$app/etherpad.log @@ -429,7 +433,7 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=2 # Overwrite the systemd configuration only if it's allowed if [ $overwrite_systemd -eq 1 ] then - ynh_add_systemd_config --others_var="ynh_node_load_PATH" + ynh_add_systemd_config fi #=================================================