From 9922bfb701f1b35a05f6d30fc19c9b75e42d7194 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Jul 2021 15:35:56 +0200
Subject: [PATCH 01/35] Update _common.sh

---
 scripts/_common.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index abc4bcc..fbe33a9 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -20,18 +20,18 @@ nodejs_version=14
 mypads_version=1.7.21
 
 # Plugin versions
-ep_align_version=0.3.34
+ep_align_version=0.3.35
 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_markdown_version=0.1.37
 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_table_of_contents_version=0.3.23
 ep_font_size_version=0.4.25
 
 #=================================================

From 6ebd591c82d37246d61337042f1a89f0beb2a450 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 26 Jul 2021 21:31:40 +0200
Subject: [PATCH 02/35] Update _common.sh

---
 scripts/_common.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index fbe33a9..e619a68 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -20,19 +20,19 @@ nodejs_version=14
 mypads_version=1.7.21
 
 # Plugin versions
-ep_align_version=0.3.35
-ep_author_hover_version=0.3.21
+ep_align_version=0.3.36
+ep_author_hover_version=0.3.22
 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_font_color_version=0.0.46
 ep_headings2_version=0.2.30
-ep_markdown_version=0.1.37
+ep_markdown_version=0.1.38
 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.23
-ep_font_size_version=0.4.25
+ep_spellcheck_version=0.0.29
+ep_subscript_and_superscript_version=0.2.32
+ep_table_of_contents_version=0.3.24
+ep_font_size_version=0.4.26
 
 #=================================================
 # PERSONAL HELPERS

From 677e7d2486f03ac7a29f9fab4fad1cd41201e453 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 6 Aug 2021 11:29:53 +0200
Subject: [PATCH 03/35] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index e619a68..27ef14e 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -17,7 +17,7 @@ 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
+mypads_version=1.7.22
 
 # Plugin versions
 ep_align_version=0.3.36

From 81707982b3db7c553dd8de2966ae4d59d871016e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 14 Aug 2021 18:14:01 +0200
Subject: [PATCH 04/35] password obfuscation is done by the core

---
 scripts/install | 4 ++--
 scripts/restore | 2 +-
 scripts/upgrade | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index fef4106..c185281 100644
--- a/scripts/install
+++ b/scripts/install
@@ -32,7 +32,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
-ynh_print_OFF; password=$YNH_APP_ARG_PASSWORD; ynh_print_ON
+password=$YNH_APP_ARG_PASSWORD
 language=$YNH_APP_ARG_LANGUAGE
 is_public=$YNH_APP_ARG_IS_PUBLIC
 export=$YNH_APP_ARG_EXPORT
@@ -67,7 +67,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=3
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
-ynh_print_OFF; ynh_app_setting_set --app=$app --key=password --value=$password; ynh_print_ON
+ynh_app_setting_set --app=$app --key=password --value=$password
 ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=export --value=$export
 ynh_app_setting_set --app=$app --key=mypads --value=$mypads
diff --git a/scripts/restore b/scripts/restore
index e7ee13c..a79a6d0 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -35,7 +35,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 export=$(ynh_app_setting_get --app=$app --key=export)
 mypads=$(ynh_app_setting_get --app=$app --key=mypads)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
-ynh_print_OFF; password=$(ynh_app_setting_get --app=$app --key=password); ynh_print_ON
+password=$(ynh_app_setting_get --app=$app --key=password)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
diff --git a/scripts/upgrade b/scripts/upgrade
index dfe4f87..ccc7e5b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -27,7 +27,7 @@ export=$(ynh_app_setting_get --app=$app --key=export)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-ynh_print_OFF; password=$(ynh_app_setting_get --app=$app --key=password); ynh_print_ON
+password=$(ynh_app_setting_get --app=$app --key=password)
 mypads=$(ynh_app_setting_get --app=$app --key=mypads)
 useldap=$(ynh_app_setting_get --app=$app --key=useldap)
 overwrite_settings=$(ynh_app_setting_get --app=$app --key=overwrite_settings)

From 722e3ecb2b7dc174f4b34ce1a71b3efef281ef33 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 27 Aug 2021 19:02:27 +0200
Subject: [PATCH 05/35] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 27ef14e..d439b49 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -29,7 +29,7 @@ ep_font_color_version=0.0.46
 ep_headings2_version=0.2.30
 ep_markdown_version=0.1.38
 ep_page_view_version=0.5.24
-ep_spellcheck_version=0.0.29
+ep_spellcheck_version=0.0.30
 ep_subscript_and_superscript_version=0.2.32
 ep_table_of_contents_version=0.3.24
 ep_font_size_version=0.4.26

From 9cf99d80e394ea678f5cdd282b21169a8513fcd7 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 3 Sep 2021 22:16:23 +0200
Subject: [PATCH 06/35] Add descriptions

---
 doc/DESCRIPTION.md    | 1 +
 doc/DESCRIPTION_fr.md | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 doc/DESCRIPTION.md
 create mode 100644 doc/DESCRIPTION_fr.md

diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
new file mode 100644
index 0000000..25e72d4
--- /dev/null
+++ b/doc/DESCRIPTION.md
@@ -0,0 +1 @@
+Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control.
\ No newline at end of file
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..974f00d
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1 @@
+Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle. 

From 6330d7365748c530acb9f17b7b0917009c8bb0bf Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Fri, 3 Sep 2021 20:16:30 +0000
Subject: [PATCH 07/35] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 33df9ef..86faf4b 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Online editor providing collaborative editing in real-time
+Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control.
 
 **Shipped version:** 1.8.14~ynh1
 
diff --git a/README_fr.md b/README_fr.md
index 343e1b8..554db6e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
-Éditeur en ligne fournissant l'édition collaborative en temps réel
+Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle. 
+
 
 **Version incluse :** 1.8.14~ynh1
 

From 0a91b78b6f211aeadba7d24f17f4990a1b4cc5ae Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 3 Sep 2021 22:16:43 +0200
Subject: [PATCH 08/35] Update restore

---
 scripts/restore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index a79a6d0..b11902a 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -42,8 +42,6 @@ password=$(ynh_app_setting_get --app=$app --key=password)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "
 

From 303d68b75ecee6446d500de2c97f14479a8fbd5d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 7 Sep 2021 09:06:03 +0200
Subject: [PATCH 09/35] Harden systemd

---
 conf/systemd.service | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/conf/systemd.service b/conf/systemd.service
index 8b27b8c..2e6be3b 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -14,5 +14,35 @@ StandardOutput=append:/var/log/__APP__/etherpad.log
 StandardError=inherit
 Restart=always
 
+# Sandboxing options to harden security
+# Depending on specificities of your service/app, you may need to tweak these 
+# .. but this should be a good baseline
+# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
+NoNewPrivileges=yes
+PrivateTmp=yes
+PrivateDevices=yes
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
+RestrictNamespaces=yes
+RestrictRealtime=yes
+DevicePolicy=closed
+ProtectSystem=full
+ProtectControlGroups=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+LockPersonality=yes
+SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap
+
+# Denying access to capabilities that should not be relevant for webapps
+# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html
+CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD
+CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
+CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT
+CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK
+CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM
+CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
+CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
+CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
+CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG 
+
 [Install]
 WantedBy=multi-user.target

From 1f0a386b4fa98efc3ad466b7b3c6d608a11180af Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 8 Sep 2021 12:00:04 +0200
Subject: [PATCH 10/35] Update _common.sh

---
 scripts/_common.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index d439b49..5929c5c 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -20,19 +20,19 @@ nodejs_version=14
 mypads_version=1.7.22
 
 # Plugin versions
-ep_align_version=0.3.36
-ep_author_hover_version=0.3.22
-ep_comments_page_version=0.1.63
+ep_align_version=0.3.38
+ep_author_hover_version=0.3.24
+ep_comments_page_version=0.1.68
 ep_countable_version=0.0.11
 ep_delete_empty_pads_version=0.0.7
-ep_font_color_version=0.0.46
-ep_headings2_version=0.2.30
-ep_markdown_version=0.1.38
+ep_font_color_version=0.0.48
+ep_headings2_version=0.2.32
+ep_markdown_version=0.1.39
 ep_page_view_version=0.5.24
-ep_spellcheck_version=0.0.30
-ep_subscript_and_superscript_version=0.2.32
-ep_table_of_contents_version=0.3.24
-ep_font_size_version=0.4.26
+ep_spellcheck_version=0.0.31
+ep_subscript_and_superscript_version=0.2.33
+ep_table_of_contents_version=0.3.25
+ep_font_size_version=0.4.28
 
 #=================================================
 # PERSONAL HELPERS

From 8e89e7016c6f2dcfd0ed5cea3d5be8abb7be5e4d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 18 Sep 2021 16:36:29 +0200
Subject: [PATCH 11/35] Update manifest.json

---
 manifest.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index c2afcbd..e9705e7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -37,8 +37,7 @@
 		"install" : [
 			{
 				"name": "domain",
-				"type": "domain",
-				"example": "sub.domain.org"
+				"type": "domain"
 			},
 			{
 				"name": "path",
@@ -48,13 +47,11 @@
 			},
 			{
 				"name": "admin",
-				"type": "user",
-				"example": "john"
+				"type": "user"
 			},
 			{
 				"name": "password",
-				"type": "password",
-				"example": "Choose a password"
+				"type": "password"
 			},
 			{
 				"name": "language",

From 152c7a54e2b553f8fd624cb396ff2aaf7f6fd74d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 28 Sep 2021 17:35:46 +0200
Subject: [PATCH 12/35] Cleaning up

---
 manifest.json      | 1 -
 scripts/_common.sh | 2 --
 scripts/install    | 2 --
 3 files changed, 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index e9705e7..836091f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,7 +13,6 @@
         "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",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 5929c5c..da2c348 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,8 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-#!/bin/bash
-
 # Dependencies for AbiWord
 abiword_app_depencencies="abiword"
 
diff --git a/scripts/install b/scripts/install
index c185281..bb73d6c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -46,12 +46,10 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 ynh_script_progression --message="Validating installation parameters..."
 
-ynh_print_OFF
 if [ "${#password}" -lt 8 ] || [ "${#password}" -gt 30 ]
 then
 	ynh_die --message="The password must be between 8 and 30 characters."
 fi
-ynh_print_ON
 
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die --message="This path already contains a folder"

From 2567622b71b60c3f16feadf0fda1016c4bb3171b Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Tue, 28 Sep 2021 15:35:54 +0000
Subject: [PATCH 13/35] Auto-update README

---
 README.md    | 1 -
 README_fr.md | 1 -
 2 files changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 86faf4b..6dcc383 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,6 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether
 ## Documentation and resources
 
 * 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
diff --git a/README_fr.md b/README_fr.md
index 554db6e..1511c1e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -60,7 +60,6 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa
 ## Documentations et ressources
 
 * 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

From cba5caaeb2bf27904f38da69a969f6ddbac503be Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 29 Sep 2021 08:38:42 +0200
Subject: [PATCH 14/35] Update _common.sh

---
 scripts/_common.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index da2c348..339219b 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -19,16 +19,16 @@ mypads_version=1.7.22
 
 # Plugin versions
 ep_align_version=0.3.38
-ep_author_hover_version=0.3.24
-ep_comments_page_version=0.1.68
+ep_author_hover_version=0.3.25
+ep_comments_page_version=0.1.71
 ep_countable_version=0.0.11
 ep_delete_empty_pads_version=0.0.7
-ep_font_color_version=0.0.48
+ep_font_color_version=0.0.49
 ep_headings2_version=0.2.32
 ep_markdown_version=0.1.39
 ep_page_view_version=0.5.24
-ep_spellcheck_version=0.0.31
-ep_subscript_and_superscript_version=0.2.33
+ep_spellcheck_version=0.0.32
+ep_subscript_and_superscript_version=0.2.35
 ep_table_of_contents_version=0.3.25
 ep_font_size_version=0.4.28
 

From 4e535a6857aa11e5d1c3a85e9be18277428619bd Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 1 Oct 2021 16:59:03 +0200
Subject: [PATCH 15/35] Update _common.sh

---
 scripts/_common.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 339219b..7bbff69 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -18,19 +18,19 @@ nodejs_version=14
 mypads_version=1.7.22
 
 # Plugin versions
-ep_align_version=0.3.38
-ep_author_hover_version=0.3.25
+ep_align_version=0.3.40
+ep_author_hover_version=0.3.26
 ep_comments_page_version=0.1.71
 ep_countable_version=0.0.11
 ep_delete_empty_pads_version=0.0.7
-ep_font_color_version=0.0.49
-ep_headings2_version=0.2.32
-ep_markdown_version=0.1.39
+ep_font_color_version=0.0.51
+ep_headings2_version=0.2.34
+ep_markdown_version=0.1.40
 ep_page_view_version=0.5.24
-ep_spellcheck_version=0.0.32
-ep_subscript_and_superscript_version=0.2.35
-ep_table_of_contents_version=0.3.25
-ep_font_size_version=0.4.28
+ep_spellcheck_version=0.0.34
+ep_subscript_and_superscript_version=0.2.36
+ep_table_of_contents_version=0.3.28
+ep_font_size_version=0.4.30
 
 #=================================================
 # PERSONAL HELPERS

From 6eb6b6961914c18d4d8ebc2f2d92ae929fe226c2 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 5 Oct 2021 08:10:51 +0200
Subject: [PATCH 16/35] Add description

---
 doc/DESCRIPTION.md    | 1 +
 doc/DESCRIPTION_fr.md | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 doc/DESCRIPTION.md
 create mode 100644 doc/DESCRIPTION_fr.md

diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
new file mode 100644
index 0000000..5ecb79a
--- /dev/null
+++ b/doc/DESCRIPTION.md
@@ -0,0 +1 @@
+Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..d64f16b
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1 @@
+Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle.

From 30b934e81dd649e3001291ba86708441d00a6aa7 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Tue, 5 Oct 2021 06:10:58 +0000
Subject: [PATCH 17/35] Auto-update README

---
 README.md    | 3 ++-
 README_fr.md | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 78585e7..923acb0 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Online editor providing collaborative editing in real-time
+Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control.
+
 
 **Shipped version:** 1.8.14~ynh2
 
diff --git a/README_fr.md b/README_fr.md
index bac5a16..b8da0b5 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
-Éditeur en ligne fournissant l'édition collaborative en temps réel
+Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle.
+
 
 **Version incluse :** 1.8.14~ynh2
 

From 3a1bab969776f5e9a3274b3cdb89f8de34857dee Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 5 Oct 2021 15:59:24 +0200
Subject: [PATCH 18/35] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7bbff69..bbdd863 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -18,7 +18,7 @@ nodejs_version=14
 mypads_version=1.7.22
 
 # Plugin versions
-ep_align_version=0.3.40
+ep_align_version=0.3.41
 ep_author_hover_version=0.3.26
 ep_comments_page_version=0.1.71
 ep_countable_version=0.0.11

From e1f47fb941a8ae62029bd3a631e91712647c0e9c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 8 Oct 2021 17:57:37 +0200
Subject: [PATCH 19/35] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index bbdd863..444ca8c 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -20,7 +20,7 @@ mypads_version=1.7.22
 # Plugin versions
 ep_align_version=0.3.41
 ep_author_hover_version=0.3.26
-ep_comments_page_version=0.1.71
+ep_comments_page_version=0.1.72
 ep_countable_version=0.0.11
 ep_delete_empty_pads_version=0.0.7
 ep_font_color_version=0.0.51

From 6a38737b750801fdde04a175dffa12e0856d891c Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Fri, 8 Oct 2021 15:57:44 +0000
Subject: [PATCH 20/35] Auto-update README

---
 README_fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_fr.md b/README_fr.md
index 62556f5..b8da0b5 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
-Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle. 
+Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle.
 
 
 **Version incluse :** 1.8.14~ynh2

From deed171cf3fc256ac07642c1a94438255921cb35 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 27 Oct 2021 10:49:45 +0200
Subject: [PATCH 21/35] Update _common.sh

---
 scripts/_common.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 444ca8c..bd758ae 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -18,19 +18,19 @@ nodejs_version=14
 mypads_version=1.7.22
 
 # Plugin versions
-ep_align_version=0.3.41
-ep_author_hover_version=0.3.26
-ep_comments_page_version=0.1.72
+ep_align_version=0.3.42
+ep_author_hover_version=0.3.27
+ep_comments_page_version=0.1.77
 ep_countable_version=0.0.11
 ep_delete_empty_pads_version=0.0.7
-ep_font_color_version=0.0.51
-ep_headings2_version=0.2.34
-ep_markdown_version=0.1.40
+ep_font_color_version=0.0.52
+ep_headings2_version=0.2.35
+ep_markdown_version=0.1.41
 ep_page_view_version=0.5.24
 ep_spellcheck_version=0.0.34
-ep_subscript_and_superscript_version=0.2.36
-ep_table_of_contents_version=0.3.28
-ep_font_size_version=0.4.30
+ep_subscript_and_superscript_version=0.2.37
+ep_table_of_contents_version=0.3.29
+ep_font_size_version=0.4.31
 
 #=================================================
 # PERSONAL HELPERS

From 10c0aaacf8ae41abc64cd5c8be7741ace08c1722 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 6 Nov 2021 15:26:53 +0100
Subject: [PATCH 22/35] Update _common.sh

---
 scripts/_common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index bd758ae..b0583d7 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -19,8 +19,8 @@ mypads_version=1.7.22
 
 # Plugin versions
 ep_align_version=0.3.42
-ep_author_hover_version=0.3.27
-ep_comments_page_version=0.1.77
+ep_author_hover_version=0.3.28
+ep_comments_page_version=0.1.79
 ep_countable_version=0.0.11
 ep_delete_empty_pads_version=0.0.7
 ep_font_color_version=0.0.52

From ed4caeb36508abd2dee30764ce5ae885db64a128 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 19 Nov 2021 18:47:00 +0100
Subject: [PATCH 23/35] Update config_panel.toml

---
 config_panel.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_panel.toml b/config_panel.toml
index 232f6f5..43dedcd 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -1,4 +1,4 @@
-version = "0.1"
+version = "1.0"
 name = "Etherpad configuration panel"
 
 [main]

From 51a380c77711fdd70eb36a34a1af4a50e8b840a6 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 19 Nov 2021 18:49:14 +0100
Subject: [PATCH 24/35] 4.3

---
 conf/nginx.conf | 9 ++-------
 manifest.json   | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index ee2852b..4fa0600 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,12 +1,7 @@
 location __PATH__/ {
 
-	# Force usage of https
-	if ($scheme = http) {
-		rewrite ^ https://$server_name$request_uri? permanent;
-	}
-
-#sub_path_only	rewrite                ^__PATH__$ __PATH__/ permanent;
-#sub_path_only	rewrite                ^__PATH__/admin$ __PATH__/admin/ permanent;
+	#sub_path_only	rewrite                ^__PATH__$ __PATH__/ permanent;
+	#sub_path_only	rewrite                ^__PATH__/admin$ __PATH__/admin/ permanent;
 	proxy_pass             http://127.0.0.1:__PORT__/;
 	proxy_set_header       Host $host;
 	proxy_buffering off;
diff --git a/manifest.json b/manifest.json
index 720f65d..8fda166 100644
--- a/manifest.json
+++ b/manifest.json
@@ -25,7 +25,7 @@
 		"email": "maniackc_dev@crudelis.fr"
 	}],
 	"requirements": {
-		"yunohost": ">= 4.2.4"
+		"yunohost": ">= 4.3.0"
 	},
 	"multi_instance": true,
 	"services": [

From e5e7ce14c14abc1cdb3506b2a1bb4bb0deffbc39 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 19 Nov 2021 19:02:26 +0100
Subject: [PATCH 25/35] cleaning up

---
 scripts/remove  | 2 +-
 scripts/restore | 4 ++--
 scripts/upgrade | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index 7fb3266..f61b51c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -31,7 +31,7 @@ export=$(ynh_app_setting_get --app=$app --key=export)
 # 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 integration..."
+	ynh_script_progression --message="Removing $app service integration..." --weight=2
 	yunohost service remove $app
 fi
 
diff --git a/scripts/restore b/scripts/restore
index 592082d..b7d4752 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -63,14 +63,14 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..."
+ynh_script_progression --message="Restoring the app main directory..." --weight=2
 
 ynh_restore_file --origin_path="$final_path"
 
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Restoring the MySQL database..."
+ynh_script_progression --message="Restoring the MySQL database..." --weight=2
 
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd
diff --git a/scripts/upgrade b/scripts/upgrade
index 813626b..c5706c3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -222,7 +222,7 @@ fi
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..."
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
 
 # Overwrite the NGINX configuration only if it's allowed
 if [ $overwrite_nginx -eq 1 ]
@@ -240,7 +240,7 @@ ynh_install_nodejs --nodejs_version=$nodejs_version
 #=================================================
 # HANDLE LOG FILES AND LOGROTATE
 #=================================================
-ynh_script_progression --message="Configuring log rotation..."
+ynh_script_progression --message="Configuring log rotation..." --weight=1
 
 # Create log directory
 install_log=/var/log/$app/installation.log
@@ -424,7 +424,7 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failrege
 #=================================================
 # SETUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Upgrading logrotate configuration..."
+ynh_script_progression --message="Upgrading logrotate configuration..." --weight=2
 
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append --specific_user=$app/$app

From d176478017e8524984657f302262516901cdc427 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 20 Nov 2021 16:33:41 +0100
Subject: [PATCH 26/35] 1.8.15

---
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index c72712b..805b735 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.14.tar.gz
-SOURCE_SUM=5404035675fb5ee9349d42927895bb3933590823612ebe31ca4cc523afdac49e
+SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.15.tar.gz
+SOURCE_SUM=3f4a4e1061f3fe6e6c6c5024ffc98045968c3801c9d630895ad78f5106a42e78
 SOURCE_SUM_PRG=sha256sum
 ARCH_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 8fda166..400c99f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Online editor providing collaborative editing in real-time",
 		"fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel"
 	},
-	"version": "1.8.14~ynh2",
+	"version": "1.8.15~ynh1",
 	"url": "http://etherpad.org",
 	"upstream": {
         "license": "Apache-2.0",

From 44cbb59c9da4b393601b0b2a6cf5e26cd62b23c3 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Sat, 20 Nov 2021 15:33:47 +0000
Subject: [PATCH 27/35] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 923acb0..e62658b 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control.
 
 
-**Shipped version:** 1.8.14~ynh2
+**Shipped version:** 1.8.15~ynh1
 
 **Demo:** https://video.etherpad.com
 
diff --git a/README_fr.md b/README_fr.md
index b8da0b5..5d8c0bb 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle.
 
 
-**Version incluse :** 1.8.14~ynh2
+**Version incluse :** 1.8.15~ynh1
 
 **Démo :** https://video.etherpad.com
 

From 1a870d2a8a1c2f498cff3125226b282b171b0db8 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 20 Nov 2021 23:37:46 +0100
Subject: [PATCH 28/35] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7ef744..2408a9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+## [1.8.15~ynh1]() - 2021-11-20
+
+#### Changed
+* [Upgrade to 1.8.15](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/d176478017e8524984657f302262516901cdc427)
+* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/2f7e3e25ec9e7d7e48a8d14742a8cf081e56a8b4)
+* [Set YunoHost requirements to 4.3.0](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/51a380c77711fdd70eb36a34a1af4a50e8b840a6)
 
 ## [1.8.14~ynh2]() - 2021-10-01
 

From f8c498c0f7de03332e3bcd28a1a6542556c68c79 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Nov 2021 11:57:08 +0100
Subject: [PATCH 29/35] Update settings.json

---
 conf/settings.json | 52 ----------------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/conf/settings.json b/conf/settings.json
index cdff7e4..baf5fc3 100644
--- a/conf/settings.json
+++ b/conf/settings.json
@@ -549,58 +549,6 @@
    */
   "loglevel": "INFO",
 
-  /*
-   * Logging configuration. See log4js documentation for further information:
-   * https://github.com/nomiddlename/log4js-node
-   *
-   * You can add as many appenders as you want here.
-   */
-  "logconfig" :
-    { "appenders": [
-        { "type": "console"
-        //, "category": "access"// only logs pad access
-        }
-
-      /*
-      , { "type": "file"
-      , "filename": "your-log-file-here.log"
-      , "maxLogSize": 1024
-      , "backups": 3 // how many log files there're gonna be at max
-      //, "category": "test" // only log a specific category
-        }
-      */
-
-      /*
-      , { "type": "logLevelFilter"
-        , "level": "warn" // filters out all log messages that have a lower level than "error"
-        , "appender":
-          {  Use whatever appender you want here  }
-        }
-      */
-
-      /*
-      , { "type": "logLevelFilter"
-        , "level": "error" // filters out all log messages that have a lower level than "error"
-        , "appender":
-          { "type": "smtp"
-          , "subject": "An error occurred in your EPL instance!"
-          , "recipients": "bar@blurdybloop.com, baz@blurdybloop.com"
-          , "sendInterval": 300 // 60 * 5 = 5 minutes -- will buffer log messages; set to 0 to send a mail for every message
-          , "transport": "SMTP", "SMTP": { // see https://github.com/andris9/Nodemailer#possible-transport-methods
-              "host": "smtp.example.com", "port": 465,
-              "secureConnection": true,
-              "auth": {
-                  "user": "foo@example.com",
-                  "pass": "bar_foo"
-              }
-            }
-          }
-        }
-      */
-
-      ]
-    }, // logconfig
-
   /* Override any strings found in locale directories */
   "customLocaleStrings": {},
 

From 63a460165ad9d5bb754d8954fdf69a098e3bf35b Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Nov 2021 12:04:51 +0100
Subject: [PATCH 30/35] Update manifest.json

---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 400c99f..e91ade3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,7 +12,7 @@
         "license": "Apache-2.0",
         "website": "http://etherpad.org",
         "demo": "https://video.etherpad.com",
-        "admindoc": "http://etherpad.org/doc/v1.8.14",
+        "admindoc": "http://etherpad.org/doc/v1.8.15",
         "code": "https://github.com/ether/etherpad-lite"
     },
 	"license": "Apache-2.0",
@@ -59,7 +59,7 @@
 					"en": "Choose your language",
 					"fr": "Choisissez la langue"
 				},
-				"choices" : ["de", "en", "es", "fr", "it"],
+				"choices" : ["ca", "de", "en", "es", "fr", "gl", "hu", "it", "nl", "pt"],
 				"default" : "en"
 			},
 			{

From 0a7d1c09e639ac888ce04a3562ebc4e2b01095e9 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Sun, 21 Nov 2021 11:04:58 +0000
Subject: [PATCH 31/35] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e62658b..57b37bd 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether
 ## Documentation and resources
 
 * Official app website: http://etherpad.org
-* Official admin documentation: http://etherpad.org/doc/v1.8.14
+* Official admin documentation: http://etherpad.org/doc/v1.8.15
 * 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
diff --git a/README_fr.md b/README_fr.md
index 5d8c0bb..8c6bc48 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -60,7 +60,7 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa
 ## Documentations et ressources
 
 * Site officiel de l'app : http://etherpad.org
-* Documentation officielle de l'admin : http://etherpad.org/doc/v1.8.14
+* Documentation officielle de l'admin : http://etherpad.org/doc/v1.8.15
 * 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

From 2e4adfa0387d144f4c9e40e34fb38193f93cd2ab Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Nov 2021 12:07:18 +0100
Subject: [PATCH 32/35] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2408a9f..51d4af9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Changelog
 * [Upgrade to 1.8.15](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/d176478017e8524984657f302262516901cdc427)
 * [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/2f7e3e25ec9e7d7e48a8d14742a8cf081e56a8b4)
 * [Set YunoHost requirements to 4.3.0](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/51a380c77711fdd70eb36a34a1af4a50e8b840a6)
+* [Add more language (gl, hu, nl, pt)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/154/commits/63a460165ad9d5bb754d8954fdf69a098e3bf35b)
 
 ## [1.8.14~ynh2]() - 2021-10-01
 

From 39567809214e24d268b9a6a4d14b3fefbbedb1ff Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Nov 2021 15:47:15 +0100
Subject: [PATCH 33/35] Update upgrade

---
 scripts/upgrade | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index c5706c3..71bb8b1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -51,6 +51,23 @@ ynh_systemd_action --action=restart --line_match="You can access your Etherpad i
 
 upgrade_type=$(ynh_check_app_version_changed)
 
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=35
+
+# 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
+
+  # Restore it if the upgrade fails
+  ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -141,23 +158,6 @@ else
   ynh_permission_url --permission="admin" --auth_header=false
 fi
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=35
-
-# 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
-
-	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # ACTIVATE MAINTENANCE MODE
 #=================================================

From 0384376fe3252d57fad1f932887e24a3a1bb8006 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Nov 2021 15:49:22 +0100
Subject: [PATCH 34/35] Update nginx.conf

---
 conf/nginx.conf | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 4fa0600..ecb5289 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,19 +1,25 @@
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-	#sub_path_only	rewrite                ^__PATH__$ __PATH__/ permanent;
-	#sub_path_only	rewrite                ^__PATH__/admin$ __PATH__/admin/ permanent;
-	proxy_pass             http://127.0.0.1:__PORT__/;
-	proxy_set_header       Host $host;
-	proxy_buffering off;
-	more_set_headers "X-Frame-Options : ALLOWALL";
+  proxy_pass         http://127.0.0.1:__PORT__/;
+  proxy_set_header   Host $host;
+  proxy_pass_header  Server;
 
-        # Recommended proxy_http version for keepalive connections
-        # https://github.com/ether/etherpad-lite/wiki/How-to-put-Etherpad-Lite-behind-a-reverse-Proxy#nginx
-        proxy_http_version 1.1;
+  # be careful, this line doesn't override any proxy_buffering on set in a conf.d/file.conf
+  proxy_buffering off;
+  more_set_headers "X-Frame-Options : ALLOWALL";
+  proxy_set_header X-Real-IP $remote_addr;       # http://wiki.nginx.org/HttpProxyModule
+  proxy_set_header X-Forwarded-For $remote_addr; # EP logs to show the actual remote IP
+  proxy_set_header X-Forwarded-Proto $scheme;    # for EP to set secure cookie flag when https is used
+  proxy_set_header Host $host;                   # pass the host header
+  proxy_http_version 1.1;                        # recommended with keepalive connections
+  
+  # WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html
+  proxy_set_header Upgrade $http_upgrade;
+  proxy_set_header Connection $connection_upgrade;
 
-
-	# Include SSOWAT user panel.
-	include conf.d/yunohost_panel.conf.inc;
+  # Include SSOWAT user panel.
+  include conf.d/yunohost_panel.conf.inc;
 }
 
 location ~* __PATH__/p/[^/]*(_|%|\*)[^/]*/export/etherpad {

From 3df1d919e596c82f918ebc41385e80086e3938f0 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Nov 2021 20:24:48 +0100
Subject: [PATCH 35/35] Update upgrade

---
 scripts/upgrade | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 71bb8b1..87dfd3d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -51,23 +51,6 @@ ynh_systemd_action --action=restart --line_match="You can access your Etherpad i
 
 upgrade_type=$(ynh_check_app_version_changed)
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=35
-
-# 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
-
-  # Restore it if the upgrade fails
-  ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -158,6 +141,23 @@ else
   ynh_permission_url --permission="admin" --auth_header=false
 fi
 
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=35
+
+# 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
+
+  # Restore it if the upgrade fails
+  ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # ACTIVATE MAINTENANCE MODE
 #=================================================