From 5201c05185b8e65635267a73339fe9d3ce255a4f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Sep 2020 15:58:47 +0200 Subject: [PATCH 01/15] upgarde packages --- conf/settings.json | 4 ++-- scripts/_variables | 16 ++++++++-------- scripts/install | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/conf/settings.json b/conf/settings.json index ffadc04..9f6fc40 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -80,13 +80,13 @@ * - "colibris": the new experimental skin (since Etherpad 1.8), candidate to * become the default in Etherpad 2.0 */ - "skinName": "no-skin", + "skinName": "colibris", /* * IP and port which etherpad should bind at */ "ip": "127.0.0.1", - "port" : __PORT__, + "port" : "__PORT__", /* * Option to hide/show the settings.json in admin page. diff --git a/scripts/_variables b/scripts/_variables index 8986342..fde3ba0 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -7,24 +7,24 @@ abiword_app_depencencies="abiword" libreoffice_app_dependencies="unoconv libreoffice-writer" # NodeJS version -nodejs_version=10 +nodejs_version=12 # 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.17 # Plugin versions -ep_align_version=0.2.0 -ep_author_hover_version=0.2.1 +ep_align_version=0.2.5 +ep_author_hover_version=0.3.0 ep_automatic_logut_version=1.0.8 -ep_comments_page_version=0.1.4 +ep_comments_page_version=0.1.5 ep_countable_version=0.0.7 ep_delete_empty_pads_version=0.0.6 -ep_font_color_version=0.0.11 +ep_font_color_version=0.0.15 ep_headings2_version=0.1.3 ep_markdown_version=0.1.7 ep_page_view_version=0.5.24 ep_spellcheck_version=0.0.7 -ep_subscript_and_superscript_version=0.1.2 -ep_table_of_contents_version=0.2.0 -ep_user_font_size_version=0.0.1 +ep_subscript_and_superscript_version=0.1.0 +ep_table_of_contents_version=0.2.3 +ep_font_size_version=0.3.8 diff --git a/scripts/install b/scripts/install index 7fe6788..c46c0bc 100644 --- a/scripts/install +++ b/scripts/install @@ -272,7 +272,7 @@ npm install ep_subscript_and_superscript@${ep_subscript_and_superscript_version} # Framapad - View a table of contents for your pad 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 -npm install ep_user_font_size@${ep_user_font_size_version} >> $install_log 2>&1 +npm install ep_font_size@${ep_font_size_version} >> $install_log 2>&1 popd chown -R $app: $final_path/node_modules From dc181f55c634698464acf167783326aef7cd3680 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Sep 2020 16:18:51 +0200 Subject: [PATCH 02/15] Update _variables --- scripts/_variables | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_variables b/scripts/_variables index fde3ba0..69d0bed 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -25,6 +25,6 @@ ep_headings2_version=0.1.3 ep_markdown_version=0.1.7 ep_page_view_version=0.5.24 ep_spellcheck_version=0.0.7 -ep_subscript_and_superscript_version=0.1.0 +ep_subscript_and_superscript_version=0.1.2 ep_table_of_contents_version=0.2.3 ep_font_size_version=0.3.8 From bb450ba302f2d458c20a3f70a1d9960040feb36c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Sep 2020 17:32:15 +0200 Subject: [PATCH 03/15] cleaning up --- README.md | 25 ++++++++++++------------- README_fr.md | 39 +++++++++++++++++++-------------------- config_panel.toml | 28 ++++++++++++++-------------- manifest.json | 32 ++++++++++++++++---------------- scripts/_variables | 8 ++++---- 5 files changed, 65 insertions(+), 67 deletions(-) diff --git a/README.md b/README.md index 42616c4..550ec21 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Etherpad with mypads plugin for YunoHost +# 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.png)](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. +> *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.* ## Overview @@ -16,7 +16,7 @@ This package will install the same plugins than [Framapad](https://framapad.org/ ## Screenshots -![](http://etherpad.org/img/screenshot.png) +![](https://github.com/ether/etherpad-lite/blob/develop/doc/images/etherpad_demo.gif) ## Demo @@ -24,25 +24,25 @@ This package will install the same plugins than [Framapad](https://framapad.org/ ## Configuration -You can access to 2 different admin panels, for etherpad by accessing `domain.tld/admin` and for mypads by `domain.tld/mypads/?/admin`. -Or, you can find a config file for etherpad at this path `/var/www/etherpad_mypads/settings.json`. +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 config file for Etherpad at this path `/var/www/etherpad_mypads/settings.json`. ## Documentation - * Official documentation: http://etherpad.org/doc/v1.7.0 - * YunoHost documentation: There no other documentations, feel free to contribute. + * Official documentation: http://etherpad.org/doc/v1.8.4 + * YunoHost documentation: https://yunohost.org/#/app_etherpad_mypads ## YunoHost specific features #### Multi-users support -Supported, with LDAP. + * Are LDAP and HTTP auth supported? **Yes** + * Can the app be used by multiple users? **Yes** #### Supported architectures -* x86-64b - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) * ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/) -* Buster x86-64b - [![](https://ci-buster.nohost.me/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-buster.nohost.me/ci/apps/etherpad_mypads/) ## Limitations @@ -70,14 +70,13 @@ Supported, with LDAP. * 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 + * MyPads plugin website: https://git.framasoft.org/framasoft/ep_mypads * Upstream app repository: https://github.com/ether/etherpad-lite * YunoHost website: https://yunohost.org/ --- -Developers infos ----------------- +## Developers infos Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing). diff --git a/README_fr.md b/README_fr.md index b81c9df..50b6324 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,22 +1,22 @@ -# Etherpad avec plugin mypads pour YunoHost +# Etherpad avec plugin 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.png)](https://install-app.yunohost.org/?app=etherpad_mypads) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer etherpad rapidement et simplement sur un serveur YunoHost. +> *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.* ## 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/). -**Version embarquée:** 1.8.4 +**Version embarquée :** 1.8.4 ## Captures d'écran -![](http://etherpad.org/img/screenshot.png) +![](https://github.com/ether/etherpad-lite/blob/develop/doc/images/etherpad_demo.gif) ## Démo @@ -24,31 +24,31 @@ Ce paquet installera les mêmes plugins que [Framapad](https://framapad.org/). ## Configuration -Vous pouvez accéder à 2 panneaux d'administration différents, pour etherpad en accédant à `domain.tld/admin` et pour mypads par `domain.tld/mypads/?/admin`. -Ou, vous pouvez trouver un fichier de configuration pour etherpad à `/var/www/etherpad_mypads/settings.json`. +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`. ## Documentation - * Documentation officielle: http://etherpad.org/doc/v1.7.0 - * Documentation YunoHost: Il n'y a pas d'autre documentation, n'hésitez pas à contribuer. + * Documentation officielle : http://etherpad.org/doc/v1.8.4 + * Documentation YunoHost : https://yunohost.org/#/app_etherpad_mypads_fr ## Fonctionnalités spécifiques à YunoHost #### Support multi-utilisateurs -Supportée, avec LDAP. + * L'authentification LDAP et HTTP est-elle prise en charge ? **Oui** + * L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** -#### Architectures supportées. +#### Architectures supportées -* x86-64b - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) * ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/) -* Buster x86-64b - [![](https://ci-buster.nohost.me/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-buster.nohost.me/ci/apps/etherpad_mypads/) ## Limitations ## Informations additionnelles -* Ce paquet installera les plugins suivants: +* 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* @@ -68,16 +68,15 @@ Supportée, avec LDAP. ## Liens - * Reporter un bug: https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues - * Site de etherpad: http://etherpad.org/ - * Site du plugin mypads: https://git.framasoft.org/framasoft/ep_mypads - * Dépôt git de l'app: https://github.com/ether/etherpad-lite - * Site de YunoHost: https://yunohost.org/ + * 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/ --- -Informations à l'intention des développeurs ----------------- +## Informations à l'intention des développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing). diff --git a/config_panel.toml b/config_panel.toml index 3581e21..7045e5f 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -9,7 +9,7 @@ name = "Etherpad configuration" name = "Export" [main.export.export] - ask = "Use abiword (~260Mo) or libreoffice (~400Mo) (more stable) to expand export possibilities (pdf, doc) ?" + ask = "Use AbiWord (~260 Mo) or LibreOffice (~400 Mo) (more stable) to expand export possibilities (PDF, doc)?" choices = ["none", "abiword", "libreoffice"] default = "none" @@ -18,32 +18,32 @@ name = "Etherpad configuration" name = "Default pad configuration" [main.pad_configuration.pad_config_nocolors] - ask = "Hide authorship colors ?" + ask = "Hide authorship colors?" type = "boolean" default = false [main.pad_configuration.pad_config_showlinenumbers] - ask = "Show line numbers ?" + ask = "Show line numbers?" type = "boolean" default = true [main.pad_configuration.pad_config_chatandusers] - ask = "Show chat and users ?" + ask = "Show chat and users?" type = "boolean" default = false [main.pad_configuration.pad_config_alwaysshowchat] - ask = "Always show chat ?" + ask = "Always show chat?" type = "boolean" default = false [main.pad_configuration.pad_config_show_markdown] - ask = "Show markdown syntax ?" + ask = "Show markdown syntax?" type = "boolean" default = false [main.pad_configuration.pad_config_pageview] - ask = "Page view ?" + ask = "Page view?" type = "boolean" default = false @@ -63,12 +63,12 @@ name = "Etherpad configuration" name = "Mypads configuration" [main.mypads_configuration.mypads] - ask = "Enable Mypads plugin ?" + ask = "Enable MyPads plugin?" type = "boolean" default = true [main.mypads_configuration.useldap] - ask = "Use ldap with Mypads ?" + ask = "Use LDAP with MyPads?" type = "boolean" default = true @@ -80,32 +80,32 @@ name = "Etherpad configuration" ask = "Is it a public website?" type = "boolean" default = true - help = "If your etherpad instance is public, everyone will be able to create a pad or see an existing one." + help = "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one." [main.overwrite_files] name = "Overwriting config files during an upgrade" [main.overwrite_files.overwrite_settings] - ask = "Overwrite the config file settings.json ?" + ask = "Overwrite the config file settings.json?" type = "boolean" default = true help = "If the file is overwritten, a backup will be created." [main.overwrite_files.overwrite_credentials] - ask = "Overwrite the config file credentials.json ?" + ask = "Overwrite the config file credentials.json?" type = "boolean" default = true help = "If the file is overwritten, a backup will be created." [main.overwrite_files.overwrite_nginx] - ask = "Overwrite the nginx config file ?" + ask = "Overwrite the NGINX config file?" type = "boolean" default = true help = "If the file is overwritten, a backup will be created." [main.overwrite_files.overwrite_systemd] - ask = "Overwrite the systemd config file ?" + ask = "Overwrite the systemd config file?" type = "boolean" default = true help = "If the file is overwritten, a backup will be created." diff --git a/manifest.json b/manifest.json index 35ae577..69f473e 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "etherpad_mypads", "packaging_format": 1, "description": { - "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." + "en": "Online editor providing collaborative editing in real-time. Framapad clone.", + "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel. Clone de Framapad." }, "version": "1.8.4~ynh1", "url": "https://framapad.org", @@ -31,8 +31,8 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain for Etherpad Mypads.", - "fr": "Choisissez un domaine pour Etherpad Mypads." + "en": "Choose a domain for Etherpad MyPads.", + "fr": "Choisissez un domaine pour Etherpad MyPads." }, "example": "sub.domain.org" }, @@ -50,8 +50,8 @@ "name": "admin", "type": "user", "ask": { - "en": "Choose the Etherpad Mypads administrator (must be an existing YunoHost user)", - "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)" + "en": "Choose the Etherpad MyPads administrator (must be an existing YunoHost user)", + "fr": "Choisissez l'administrateur Etherpad MyPads (doit être un utilisateur YunoHost existant)" }, "example": "john" }, @@ -82,8 +82,8 @@ "fr": "Est-ce un site public ?" }, "help": { - "en": "If your etherpad instance is public, everyone will be able to create a pad or see an existing one.", - "fr": "Si votre instance etherpad est publique, tout le monde pourra créer un pad ou voir un existant." + "en": "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one.", + "fr": "Si votre instance Etherpad est publique, tout le monde pourra créer un pad ou voir un pad existant." }, "default": true }, @@ -91,8 +91,8 @@ "name": "export", "type": "string", "ask": { - "en": "Use abiword (~260Mo) or libreoffice (~400Mo) (more stable) to expand export possibilities (pdf, doc) ?", - "fr": "Utiliser abiword (~260Mo) ou libre office (~400Mo) (plus stable) pour étendre les possibilités d'export (pdf, doc) ?" + "en": "Use AbiWord (~260 Mo) or LibreOffice (~400 Mo) (more stable) to expand export possibilities (PDF, doc)?", + "fr": "Utiliser AbiWord (~260 Mo) ou LibreOffice (~400 Mo) (plus stable) pour étendre les possibilités d'export (PDF, doc) ?" }, "choices" : ["none", "abiword", "libreoffice"], "default" : "none" @@ -101,8 +101,8 @@ "name": "mypads", "type": "boolean", "ask": { - "en": "Do you want to install mypads plugin ?", - "fr": "Voulez-vous installer le plugin mypads ?" + "en": "Do you want to install MyPads plugin?", + "fr": "Voulez-vous installer le plugin MyPads ?" }, "help": { "en": "mypads plugin" @@ -113,12 +113,12 @@ "name": "useldap", "type": "boolean", "ask": { - "en": "Do you want to use ldap with mypads ?", - "fr": "Voulez-vous utiliser ldap avec mypads ?" + "en": "Do you want to use LDAP with MyPads?", + "fr": "Voulez-vous utiliser LDAP avec MyPads ?" }, "help": { - "en": "Using ldap won't let you add new user aside from YunoHost users.", - "fr": "Utiliser ldap ne vous permettra pas d'ajouter un nouvel utilisateur en dehors des utilisateurs de YunoHost." + "en": "Using LDAP won't let you add new user aside from YunoHost users.", + "fr": "Utiliser LDAP ne vous permettra pas d'ajouter un nouvel utilisateur en dehors des utilisateurs de YunoHost." }, "default": true } diff --git a/scripts/_variables b/scripts/_variables index 69d0bed..d9bdda0 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -1,16 +1,16 @@ #!/bin/bash -# Dependencies for abiword +# Dependencies for AbiWord abiword_app_depencencies="abiword" -# Dependencies for libre office +# Dependencies for LibreOffice libreoffice_app_dependencies="unoconv libreoffice-writer" # NodeJS version nodejs_version=12 -# Mypads version -# This variable is mostly used to force an upgrade of the package in case of new versions of mypads. +# 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.17 # Plugin versions From 215756f05ac304e89fcb2bd7ef971b689dbcf223 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Sep 2020 18:38:28 +0200 Subject: [PATCH 04/15] fix typo --- conf/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/settings.json b/conf/settings.json index 9f6fc40..a8ad120 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -61,7 +61,7 @@ /* * Name your instance! */ - "title": "Etherpad Mypads", + "title": "Etherpad MyPads", /* * favicon default name @@ -86,7 +86,7 @@ * IP and port which etherpad should bind at */ "ip": "127.0.0.1", - "port" : "__PORT__", + "port" : __PORT__, /* * Option to hide/show the settings.json in admin page. From 33323fe30741d86cd50d233902d6065563968285 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Sep 2020 19:02:08 +0200 Subject: [PATCH 05/15] Fix capitalization --- scripts/backup | 16 +++++++--------- scripts/change_url | 6 +++--- scripts/install | 10 +++++----- scripts/remove | 6 +++--- scripts/restore | 8 ++++---- scripts/upgrade | 10 +++++----- 6 files changed, 27 insertions(+), 29 deletions(-) diff --git a/scripts/backup b/scripts/backup index 71a7b00..1b563c6 100644 --- a/scripts/backup +++ b/scripts/backup @@ -19,7 +19,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=2 +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -28,11 +28,13 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_script_progression --message="Backing up the main app directory..." --weight=2 CHECK_SIZE "$final_path" ynh_backup --src_path="$final_path" @@ -40,14 +42,13 @@ ynh_backup --src_path="$final_path" #================================================= # BACKUP NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Backing up the MySQL database..." --weight=3 +ynh_print_info --message="Backing up the MySQL database..." ynh_mysql_dump_db --database="$db_name" > db.sql CHECK_SIZE "db.sql" @@ -57,21 +58,18 @@ CHECK_SIZE "db.sql" #================================================= # BACKUP LOGROTATE #================================================= -ynh_script_progression --message="Backing up logrotate configuration..." ynh_backup --src_path="/etc/logrotate.d/$app" #================================================= # BACKUP SYSTEMD #================================================= -ynh_script_progression --message="Backing up systemd configuration..." ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= # BACKUP FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Backing up fail2ban configuration..." ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" @@ -80,4 +78,4 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 2b55063..b3954a7 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -33,7 +33,7 @@ port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." --weight=40 +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 @@ -88,7 +88,7 @@ ynh_abort_if_errors #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=3 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=3 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -120,7 +120,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --action=reload --service_name=nginx diff --git a/scripts/install b/scripts/install index c46c0bc..57f0ef6 100644 --- a/scripts/install +++ b/scripts/install @@ -126,7 +126,7 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=2 +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated nginx config ynh_add_nginx_config @@ -298,7 +298,7 @@ fi #================================================= # SETUP FAIL2BAN #================================================= -ynh_script_progression --message="Configuring fail2ban..." --weight=13 +ynh_script_progression --message="Configuring Fail2ban..." --weight=13 # Create a dedicated fail2ban config ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failregex=" .* .POST /mypads/api/auth/login HTTP/1.1. 400" --max_retry=5 @@ -318,7 +318,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --action=reload --service_name=nginx @@ -348,14 +348,14 @@ admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4) if [ $mypads -eq 1 ] then - Informations="You can access 2 different admin panels, for etherpad by accessing https://$domain${path_url%/}/admin and for mypads by accessing https://$domain${path_url%/}/mypads/?/admin." + Informations="You can access 2 different admin panels, for Etherpad by accessing https://$domain${path_url%/}/admin and for MyPads by accessing https://$domain${path_url%/}/mypads/?/admin." else Informations="You can access the admin panel by accessing https://$domain${path_url%/}/admin." fi ynh_print_OFF echo "$Informations -Or, you can find a config file for etherpad at this path /var/www/etherpad_mypads/settings.json. +You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json. Your credentials for the admin panel are: - login : $admin diff --git a/scripts/remove b/scripts/remove index 1415a9b..5507df8 100755 --- a/scripts/remove +++ b/scripts/remove @@ -71,7 +71,7 @@ ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." +ynh_script_progression --message="Removing Etherpad main directory..." # Remove the app directory securely ynh_secure_remove --file="/var/www/$app" @@ -79,7 +79,7 @@ ynh_secure_remove --file="/var/www/$app" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=2 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2 # Remove the dedicated nginx config ynh_remove_nginx_config @@ -95,7 +95,7 @@ ynh_remove_logrotate #================================================= # REMOVE FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Removing fail2ban configuration..." --weight=7 +ynh_script_progression --message="Removing Fail2ban configuration..." --weight=7 # Remove the dedicated fail2ban config ynh_remove_fail2ban_config diff --git a/scripts/restore b/scripts/restore index 619f0e4..1510ced 100644 --- a/scripts/restore +++ b/scripts/restore @@ -154,7 +154,7 @@ systemctl enable $app.service #================================================= # RESTORE FAIL2BAN CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the fail2ban configuration..." --weight=6 +ynh_script_progression --message="Restoring the Fail2ban configuration..." --weight=6 ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" @@ -163,7 +163,7 @@ ynh_systemd_action --action=restart --service_name=fail2ban #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --action=reload --service_name=nginx @@ -188,14 +188,14 @@ ynh_maintenance_mode_OFF if [ $mypads -eq 1 ] then - Informations="You can access 2 different admin panels, for etherpad by accessing https://$domain${path_url%/}/admin and for mypads by accessing https://$domain${path_url%/}/mypads/?/admin." + Informations="You can access 2 different admin panels, for Etherpad by accessing https://$domain${path_url%/}/admin and for MyPads by accessing https://$domain${path_url%/}/mypads/?/admin." else Informations="You can access to the admin panel, by accessing https://$domain${path_url%/}/admin." fi ynh_print_OFF echo "$Informations -Or, you can find a config file for etherpad at this path /var/www/etherpad_mypads/settings.json. +You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json. Your credentials for the admin panel are: - login : $admin diff --git a/scripts/upgrade b/scripts/upgrade index 4b9666f..2becd12 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -194,7 +194,7 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." +ynh_script_progression --message="Upgrading NGINX web server configuration..." # Overwrite the nginx configuration only if it's allowed if [ $overwrite_nginx -eq 1 ] @@ -361,7 +361,7 @@ chown $app -R /var/log/$app/etherpad.log #================================================= # UPGRADE FAIL2BAN #================================================= -ynh_script_progression --message="Reconfiguring fail2ban..." --weight=8 +ynh_script_progression --message="Reconfiguring Fail2ban..." --weight=8 # Create a dedicated fail2ban config ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failregex=" .* .POST /mypads/api/auth/login HTTP/1.1. 400" --max_retry=5 @@ -414,7 +414,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --action=reload --service_name=nginx @@ -454,13 +454,13 @@ ynh_app_changelog --format=$format if [ $mypads -eq 1 ] then - Informations="You can access 2 different admin panels, for etherpad by accessing https://$domain${path_url%/}/admin and for mypads by accessing https://$domain${path_url%/}/mypads/?/admin." + Informations="You can access 2 different admin panels, for Etherpad by accessing https://$domain${path_url%/}/admin and for MyPads by accessing https://$domain${path_url%/}/mypads/?/admin." else Informations="You can access the admin panel by accessing https://$domain${path_url%/}/admin." fi echo "$Informations -Or, you can find a config file for etherpad at this path /var/www/etherpad_mypads/settings.json. +You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json. You can configure this app easily by using the experimental config-panel feature $admin_panel/config-panel. You can also find some specific actions for this app by using the experimental action feature $admin_panel/actions. From ef3531aae5360e68eecf04c81ba4a3e14910998c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Sep 2020 19:29:58 +0200 Subject: [PATCH 06/15] Fix caps --- actions.toml | 10 +++++----- scripts/actions/add_remove_abiword | 2 +- scripts/actions/add_remove_libreoffice | 4 ++-- scripts/actions/public_private | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/actions.toml b/actions.toml index 9f32bf8..0273bb8 100644 --- a/actions.toml +++ b/actions.toml @@ -1,20 +1,20 @@ [add_remove_abiword] -name = "Install/remove abiword" +name = "Install/remove AbiWord" command = "/bin/bash scripts/actions/add_remove_abiword" # user = "root" # optional # cwd = "/" # optional # accepted_return_codes = [0, 1, 2, 3] # optional accepted_return_codes = [0] -description = "Install or remove abiword" +description = "Install or remove AbiWord" [add_remove_libreoffice] -name = "Install/remove libreoffice" +name = "Install/remove LibreOffice" command = "/bin/bash scripts/actions/add_remove_libreoffice" # user = "root" # optional # cwd = "/" # optional # accepted_return_codes = [0, 1, 2, 3] # optional accepted_return_codes = [0] -description = "Install or remove libreoffice" +description = "Install or remove LibreOffice" [list_all_pads] name = "List all existing pads" @@ -46,5 +46,5 @@ description = "Change the public access of the app." [public_private.arguments] [public_private.arguments.is_public] type = "boolean" - ask = "Is it a public app ?" + ask = "Is it a public app?" default = true diff --git a/scripts/actions/add_remove_abiword b/scripts/actions/add_remove_abiword index 52d8325..891ab94 100755 --- a/scripts/actions/add_remove_abiword +++ b/scripts/actions/add_remove_abiword @@ -65,7 +65,7 @@ fi # INSTALL OR REMOVE ABIWORD #================================================= -ynh_script_progression --message="$action2 Abiword..." --weight=3 +ynh_script_progression --message="$action2 AbiWord..." --weight=3 # Load common variables, and especially abiword dependencies. source scripts/_variables diff --git a/scripts/actions/add_remove_libreoffice b/scripts/actions/add_remove_libreoffice index 55e158d..106ecbd 100755 --- a/scripts/actions/add_remove_libreoffice +++ b/scripts/actions/add_remove_libreoffice @@ -46,7 +46,7 @@ else action2=Installing fi -ynh_print_info --message="Libreoffice will be $action1." +ynh_print_info --message="LibreOffice will be $action1." if apt-cache depends ${app//_/-}-ynh-deps | grep --quiet abiword then @@ -65,7 +65,7 @@ fi # INSTALL OR REMOVE LIBREOFFICE #================================================= -ynh_script_progression --message="$action2 Libreoffice..." --weight=3 +ynh_script_progression --message="$action2 LibreOffice..." --weight=3 # Load common variables, and especially libreoffice dependencies. source scripts/_variables diff --git a/scripts/actions/public_private b/scripts/actions/public_private index 2c33aed..39d6d3b 100755 --- a/scripts/actions/public_private +++ b/scripts/actions/public_private @@ -69,7 +69,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload From 566005b735711c2b663c0ac85a219c6f02c022e3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Sep 2020 21:38:36 +0200 Subject: [PATCH 07/15] Add skin option explanation --- README.md | 8 +++++--- README_fr.md | 7 ++++--- scripts/_common.sh | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 550ec21..92b87ce 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,10 @@ This package will install the same plugins than [Framapad](https://framapad.org/ ## 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 config file for Etherpad at this path `/var/www/etherpad_mypads/settings.json`. +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`. ## Documentation @@ -36,7 +38,7 @@ You can also find a config file for Etherpad at this path `/var/www/etherpad_myp #### Multi-users support - * Are LDAP and HTTP auth supported? **Yes** + * Are LDAP auth supported? **Yes** * Can the app be used by multiple users? **Yes** #### Supported architectures diff --git a/README_fr.md b/README_fr.md index 50b6324..61bbc51 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,8 +24,9 @@ Ce paquet installera les mêmes plugins que [Framapad](https://framapad.org/). ## 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`. +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`. ## Documentation @@ -36,7 +37,7 @@ Vous pouvez également trouver le fichier de configuration pour Etherpad à `/va #### Support multi-utilisateurs - * L'authentification LDAP et HTTP est-elle prise en charge ? **Oui** + * L'authentification LDAP est-elle prise en charge ? **Oui** * L'application peut-elle être utilisée par plusieurs utilisateurs ? **Oui** #### Architectures supportées diff --git a/scripts/_common.sh b/scripts/_common.sh index fdf847f..5d01975 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -21,8 +21,8 @@ CHECK_SIZE () { # Vérifie avant chaque backup que l'espace est suffisant if [ $free_space -le $backup_size ] then ynh_print_err "Espace insuffisant pour sauvegarder $file_to_analyse." - ynh_print_err "Espace disponible: $(HUMAN_SIZE $free_space)" - ynh_die "Espace nécessaire: $(HUMAN_SIZE $backup_size)" + ynh_print_err "Espace disponible : $(HUMAN_SIZE $free_space)" + ynh_die "Espace nécessaire : $(HUMAN_SIZE $backup_size)" fi } From 8ed3415b1e67804e0020012a827d6f06674384cd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Sep 2020 00:24:22 +0200 Subject: [PATCH 08/15] Add skinVariants in settings --- conf/settings.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/conf/settings.json b/conf/settings.json index a8ad120..18bb941 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -82,6 +82,32 @@ */ "skinName": "colibris", + /* + * Skin Variants + * + * Use the UI skin variants builder at /p/test#skinvariantsbuilder + * + * For the colibris skin only, you can choose how to render the three main + * containers: + * - toolbar (top menu with icons) + * - editor (containing the text of the pad) + * - background (area outside of editor, mostly visible when using page style) + * + * For each of the 3 containers you can choose 4 color combinations: + * super-light, light, dark, super-dark. + * + * For example, to make the toolbar dark, you will include "dark-toolbar" into + * skinVariants. + * + * You can provide multiple skin variants separated by spaces. Default + * skinVariant is "super-light-toolbar super-light-editor light-background". + * + * For the editor container, you can also make it full width by adding + * "full-width-editor" variant (by default editor is rendered as a page, with + * a max-width of 900px). + */ + "skinVariants": "super-light-toolbar super-light-editor light-background", + /* * IP and port which etherpad should bind at */ From b8c1fd12b6349046eb25f03eacc3c5a2c368f330 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Sep 2020 11:01:47 +0200 Subject: [PATCH 09/15] Upgrade settings to last version --- conf/settings.json | 109 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 19 deletions(-) diff --git a/conf/settings.json b/conf/settings.json index 18bb941..c77936b 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -55,7 +55,14 @@ * * "password": "${PASSW}" // if PASSW is not defined would result in password === null * "password": "${PASSW:}" // if PASSW is not defined would result in password === '' + + * If you want to use an empty value (null) as default value for a variable, + * simply do not set it, without putting any colons: "${ABIWORD}". * + * 3) if you want to use newlines in the default value of a string parameter, + * use "\n" as usual. + * + * "defaultPadText" : "${DEFAULT_PAD_TEXT}Line 1\nLine 2" */ { /* @@ -109,10 +116,17 @@ "skinVariants": "super-light-toolbar super-light-editor light-background", /* - * IP and port which etherpad should bind at + * IP and port which Etherpad should bind at. + * + * Binding to a Unix socket is also supported: just use an empty string for + * the ip, and put the full path to the socket in the port parameter. + * + * EXAMPLE USING UNIX SOCKET: + * "ip": "", // <-- has to be an empty string + * "port" : "/somepath/etherpad.socket", // <-- path to a Unix socket */ "ip": "127.0.0.1", - "port" : __PORT__, + "port": __PORT__, /* * Option to hide/show the settings.json in admin page. @@ -140,7 +154,7 @@ /* * The default text of a pad */ - "defaultPadText" : "Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at http:\/\/etherpad.org\n", + "defaultPadText" : "Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at https:\/\/etherpad.org\n", /* * Default Pad behavior. @@ -148,17 +162,18 @@ * Change them if you want to override. */ "padOptions": { - "noColors": false, - "showControls": true, - "showChat": true, - "showLineNumbers": true, + "noColors": false, + "showControls": true, + "showChat": true, + "showLineNumbers": true, "useMonospaceFont": false, - "userName": false, - "userColor": false, - "rtl": false, - "alwaysShowChat": false, - "chatAndUsers": false, + "userName": false, + "userColor": false, + "rtl": false, + "alwaysShowChat": false, + "chatAndUsers": false, "lang": "__LANGUAGE__", + }, /* * Pad Shortcut Keys @@ -188,7 +203,7 @@ "pageDown": true }, - // Plugins config + // Plugins config // ep_automatic_logut "automatic_logut_mins_show" : true, // Show logout time selector "automatic_logut_url" : "../../", // Redirection URL address @@ -199,7 +214,6 @@ // ep_page_view "ep_page_view_default" : false, // Set page view as default "ep_page_view_disable_change" : false, // Disable change of page view setting in UI - }, // Other plugins config // ep_comments_page @@ -284,7 +298,7 @@ * it to null disables Abiword and will only allow plain text and HTML * import/exports. */ - "abiword" : null, + "abiword": null, /* * This is the absolute path to the soffice executable. @@ -292,7 +306,7 @@ * LibreOffice can be used in lieu of Abiword to export pads. * Setting it to null disables LibreOffice exporting. */ - "soffice" : null, + "soffice": null, /* * Path to the Tidy executable. @@ -383,7 +397,7 @@ * Set to 0 to let the scroll to be handled as default by Etherpad */ "percentageToScrollWhenUserPressesArrowUp": 0 -}, + }, /* * Restrict socket.io transport methods @@ -406,6 +420,60 @@ "indentationOnNewLine": false, */ + /* + * From Etherpad 1.8.3 onwards, import and export of pads is always rate + * limited. + * + * The default is to allow at most 10 requests per IP in a 90 seconds window. + * After that the import/export request is rejected. + * + * See https://github.com/nfriedly/express-rate-limit for more options + */ + "importExportRateLimiting": { + // duration of the rate limit window (milliseconds) + "windowMs": 90000, + + // maximum number of requests per IP to allow during the rate limit window + "max": 10 + }, + + /* + * From Etherpad 1.8.3 onwards, the maximum allowed size for a single imported + * file is always bounded. + * + * File size is specified in bytes. Default is 50 MB. + */ + "importMaxFileSize": 52428800, // 50 * 1024 * 1024 + + + /* + * From Etherpad 1.8.3 onwards import was restricted to authors who had + * content within the pad. + * + * This setting will override that restriction and allow any user to import + * without the requirement to add content to a pad. + * + * This setting is useful for when you use a plugin for authentication so you + * can already trust each user. + */ + "allowAnyoneToImport": false, + + /* + * From Etherpad 1.9.0 onwards, when Etherpad is in production mode commits from individual users are rate limited + * + * The default is to allow at most 10 changes per IP in a 1 second window. + * After that the change is rejected. + * + * See https://github.com/animir/node-rate-limiter-flexible/wiki/Overall-example#websocket-single-connection-prevent-flooding for more options + */ + "commitRateLimiting": { + // duration of the rate limit window (seconds) + "duration": 1, + + // maximum number of chanes per IP to allow during the rate limit window + "points": 10 + }, + /* * Toolbar buttons configuration. * @@ -454,7 +522,7 @@ "logconfig" : { "appenders": [ { "type": "console" - //, "category": "access"// only logs pad access + , // "category": "access" // only logs pad access } /* @@ -495,5 +563,8 @@ */ ] - } // logconfig + }, // logconfig + + /* Override any strings found in locale directories */ + "customLocaleStrings": {} } From 82ff98eee38b4af84be163b85f25d914b0391e2b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Sep 2020 11:25:44 +0200 Subject: [PATCH 10/15] Update settings.json --- conf/settings.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/settings.json b/conf/settings.json index c77936b..6c65f50 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -126,7 +126,7 @@ * "port" : "/somepath/etherpad.socket", // <-- path to a Unix socket */ "ip": "127.0.0.1", - "port": __PORT__, + "port" : __PORT__, /* * Option to hide/show the settings.json in admin page. @@ -172,7 +172,7 @@ "rtl": false, "alwaysShowChat": false, "chatAndUsers": false, - "lang": "__LANGUAGE__", + "lang": "__LANGUAGE__" }, /* @@ -298,7 +298,7 @@ * it to null disables Abiword and will only allow plain text and HTML * import/exports. */ - "abiword": null, + "abiword" : null, /* * This is the absolute path to the soffice executable. @@ -306,7 +306,7 @@ * LibreOffice can be used in lieu of Abiword to export pads. * Setting it to null disables LibreOffice exporting. */ - "soffice": null, + "soffice" : null, /* * Path to the Tidy executable. From 54a69f1b42a24b2b1fed7b6a2872df40a2a40276 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Sep 2020 17:14:31 +0200 Subject: [PATCH 11/15] Fix demo link --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 92b87ce..394440a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This package will install the same plugins than [Framapad](https://framapad.org/ ## Demo -* [Official demo](https://oasis.sandstorm.io/appdemo/h37dm17aa89yrd8zuqpdn36p6zntumtv08fjpu8a8zrte7q1cn60) +* [Demo](https://etherpad.wikimedia.org/) ## Configuration diff --git a/README_fr.md b/README_fr.md index 61bbc51..10a1fa1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Ce paquet installera les mêmes plugins que [Framapad](https://framapad.org/). ## Démo -* [Démo officielle](https://oasis.sandstorm.io/appdemo/h37dm17aa89yrd8zuqpdn36p6zntumtv08fjpu8a8zrte7q1cn60) +* [Démo](https://etherpad.wikimedia.org/) ## Configuration diff --git a/manifest.json b/manifest.json index 69f473e..83daae7 100644 --- a/manifest.json +++ b/manifest.json @@ -1,10 +1,10 @@ { - "name": "Etherpad Mypads", + "name": "Etherpad MyPads", "id": "etherpad_mypads", "packaging_format": 1, "description": { - "en": "Online editor providing collaborative editing in real-time. Framapad clone.", - "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel. Clone de Framapad." + "en": "Online editor providing collaborative editing in real-time.", + "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel." }, "version": "1.8.4~ynh1", "url": "https://framapad.org", @@ -31,8 +31,8 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain for Etherpad MyPads.", - "fr": "Choisissez un domaine pour Etherpad MyPads." + "en": "Choose a domain for Etherpad MyPads", + "fr": "Choisissez un domaine pour Etherpad MyPads" }, "example": "sub.domain.org" }, @@ -40,8 +40,8 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for Etherpad", - "fr": "Choisissez un chemin pour Etherpad" + "en": "Choose a path for Etherpad MyPads", + "fr": "Choisissez un chemin pour Etherpad MyPads" }, "example": "/pad", "default": "/pad" From 3eda68a61d9fbe03e94af63cb33b56cbf4157591 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Sep 2020 11:02:08 +0200 Subject: [PATCH 12/15] Update ep_font_size description --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 394440a..f9e8f51 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether #### Multi-users support - * Are LDAP auth supported? **Yes** + * Is LDAP auth supported (for MyPads access only)? **Yes** * Can the app be used by multiple users? **Yes** #### Supported architectures @@ -59,6 +59,7 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether * [ep_countable](https://www.npmjs.com/package/ep_countable) - *Displays paragraphs, sentences, words and characters counts.* * [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* @@ -66,7 +67,6 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether * [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* - * [ep_user_font_size](https://www.npmjs.com/package/ep_user_font_size) - *User Pad Contents font size can be set in settings, this does not effect other peoples views* ## Links diff --git a/README_fr.md b/README_fr.md index 10a1fa1..8a4665a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -37,7 +37,7 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa #### Support multi-utilisateurs - * L'authentification LDAP est-elle prise en charge ? **Oui** + * 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 @@ -58,6 +58,7 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa * [ep_countable](https://www.npmjs.com/package/ep_countable) - *Affiche les paragraphes, phrases, mots et nombres 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* @@ -65,7 +66,6 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa * [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* - * [ep_user_font_size](https://www.npmjs.com/package/ep_user_font_size)- *Permet de définir taille de la police dans les paramètres, cela n'affecte pas les vues des autres personnes*. ## Liens From 41d4220575e1fcb59150813d0f8fe1917603738e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Sep 2020 11:34:43 +0200 Subject: [PATCH 13/15] Set official demo --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f9e8f51..c6c0e58 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This package will install the same plugins than [Framapad](https://framapad.org/ ## Demo -* [Demo](https://etherpad.wikimedia.org/) +* [Official demo](https://video.etherpad.com/) ## Configuration diff --git a/README_fr.md b/README_fr.md index 8a4665a..a3413fd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Ce paquet installera les mêmes plugins que [Framapad](https://framapad.org/). ## Démo -* [Démo](https://etherpad.wikimedia.org/) +* [Démo officielle](https://video.etherpad.com/) ## Configuration From 0a0d26cc5cadb5d51ae0e8dbbef41c9488af2433 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Sep 2020 15:22:08 +0200 Subject: [PATCH 14/15] deactivate not working countable plugin --- scripts/_variables | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_variables b/scripts/_variables index d9bdda0..70a9eb8 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -18,7 +18,7 @@ ep_align_version=0.2.5 ep_author_hover_version=0.3.0 ep_automatic_logut_version=1.0.8 ep_comments_page_version=0.1.5 -ep_countable_version=0.0.7 +#ep_countable_version=0.0.7 ep_delete_empty_pads_version=0.0.6 ep_font_color_version=0.0.15 ep_headings2_version=0.1.3 diff --git a/scripts/install b/scripts/install index 57f0ef6..c9b8e44 100644 --- a/scripts/install +++ b/scripts/install @@ -250,7 +250,7 @@ npm install ep_automatic_logut@${ep_automatic_logut_version} >> $install_log 2>& # Framapad - Adds comments on sidebar and link it to the text. npm install ep_comments_page@${ep_comments_page_version} >> $install_log 2>&1 # Framapad - Displays paragraphs, sentences, words and characters counts. -npm install ep_countable@${ep_countable_version} >> $install_log 2>&1 +#npm install ep_countable@${ep_countable_version} >> $install_log 2>&1 # Framapad - Delete pads which were never edited npm install ep_delete_empty_pads@${ep_delete_empty_pads_version} >> $install_log 2>&1 # Framapad - Apply colors to fonts From a9d37a313b032f1beccb079ab11e97d9d89d7835 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Sep 2020 15:31:24 +0200 Subject: [PATCH 15/15] Remove ep_countable plugin from de README list --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index c6c0e58..eccab34 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,6 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether * [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Adds author names to span titles* * [ep_automatic_logut](https://www.npmjs.com/package/ep_automatic_logut) - *Automatically disconnects user after some period of time (Prevent server overload)* * [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) - *Displays paragraphs, sentences, words and characters counts.* * [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* diff --git a/README_fr.md b/README_fr.md index a3413fd..f8d1c62 100644 --- a/README_fr.md +++ b/README_fr.md @@ -55,7 +55,6 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa * [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Ajoute des noms d'auteurs* * [ep_automatic_logut](https://www.npmjs.com/package/ep_automatic_logut) - *Déconnecte automatiquement l'utilisateur après une certaine période de temps (Prévient la surcharge du serveur)* * [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) - *Affiche les paragraphes, phrases, mots et nombres 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*.