From d060545d04f4ec93bd7b45fc9bc7d94f36449d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 09:32:37 +0200
Subject: [PATCH 01/83] Update install

---
 scripts/install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 0a0f018..3afa696 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,7 +80,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    ynh_exec_warn_less npm install pnpm -g
+    env $ynh_node_load_PATH corepack enable
+    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 

From 969ca0b24b3c2741835659c326f2010871683376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 09:49:06 +0200
Subject: [PATCH 02/83] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 3afa696..0abeee3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,8 +80,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack enable
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack install pnpm@latest --activate
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 

From ffa8c6bb9529d873389b54405fa1aaae998400f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 09:57:25 +0200
Subject: [PATCH 03/83] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0abeee3..33a89bb 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,8 +80,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack enable
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack install pnpm@latest --activate
+    env $ynh_node_load_PATH corepack enable
+    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack install pnpm@latest --activate
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 

From d35e93149fa59c61479ec9de760babf94166bcc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 10:03:35 +0200
Subject: [PATCH 04/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 33a89bb..8ae71b7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
  	ynh_use_nodejs
     env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack install pnpm@latest --activate
+    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack install pnpm@latest #--activate
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 

From aff9a0dacfe2d2f8e6cd33618a6f3aed88be08c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 10:08:43 +0200
Subject: [PATCH 05/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 8ae71b7..4698a6f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
  	ynh_use_nodejs
     env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack install pnpm@latest #--activate
+    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack install -g pnpm@latest #--activate
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 

From 29c8de045d9c220733b05335b23c3dbfd6ec565c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 10:46:12 +0200
Subject: [PATCH 06/83] Update systemd.service

---
 conf/systemd.service | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index a10e078..eab08fb 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -7,10 +7,8 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-Environment=ETHERPAD_PRODUCTION=true
-Environment="NODE_ENV=production"
-Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__INSTALL_DIR__/bin/run.sh
+Environment=NODE_ENV=production
+ExecStart=pnpm run prod
 Restart=always
 
 # Sandboxing options to harden security

From 63ea2a6b802b7831903a5425919f975e50e1754e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 11:29:56 +0200
Subject: [PATCH 07/83] Update install

---
 scripts/install | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 4698a6f..e94bc34 100644
--- a/scripts/install
+++ b/scripts/install
@@ -79,9 +79,11 @@ chown $app:$app "$install_dir/credentials.json"
 ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
- 	ynh_use_nodejs
-    env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack install -g pnpm@latest #--activate
+    ynh_use_nodejs
+    corepack enable
+    corepack prepare pnpm@latest --activate
+    #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install
+    #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 

From 497fd79b144eae3aa340bc4256f672bb96d68dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 11:38:05 +0200
Subject: [PATCH 08/83] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index e94bc34..6f24306 100644
--- a/scripts/install
+++ b/scripts/install
@@ -82,9 +82,9 @@ pushd $install_dir
     ynh_use_nodejs
     corepack enable
     corepack prepare pnpm@latest --activate
-    #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm --recursive i --production
     #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
- 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
+ 	#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 
 #=================================================

From fa5b2fed3b79d3a8422dacf58edaeaf850a41be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 12:31:58 +0200
Subject: [PATCH 09/83] Update install

---
 scripts/install | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index 6f24306..56e9c23 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,11 +80,10 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    corepack enable
-    corepack prepare pnpm@latest --activate
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm --recursive i --production
-    #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
- 	#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
+
+    ynh_exec_warn_less ynh_exec_as $appcorepack enable
+    ynh_exec_warn_less ynh_exec_as $app corepack prepare pnpm@latest --activate
+ 	ynh_exec_warn_less ynh_exec_as $app bin/installDeps.sh
 popd
 
 #=================================================

From 861f249f5f45e0ee58db811d5a264cc2a0d9add0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 12:33:27 +0200
Subject: [PATCH 10/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 56e9c23..89270bb 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
     ynh_use_nodejs
 
-    ynh_exec_warn_less ynh_exec_as $appcorepack enable
+    ynh_exec_warn_less ynh_exec_as $app corepack enable
     ynh_exec_warn_less ynh_exec_as $app corepack prepare pnpm@latest --activate
  	ynh_exec_warn_less ynh_exec_as $app bin/installDeps.sh
 popd

From db650dda89ecaf8acff5f8925f82f24be6c370b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 12:35:27 +0200
Subject: [PATCH 11/83] Update install

---
 scripts/install | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 89270bb..f7d23e4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,9 +80,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-
-    ynh_exec_warn_less ynh_exec_as $app corepack enable
-    ynh_exec_warn_less ynh_exec_as $app corepack prepare pnpm@latest --activate
+    corepack enable
+    corepack prepare pnpm@latest --activate
  	ynh_exec_warn_less ynh_exec_as $app bin/installDeps.sh
 popd
 

From 88bba7bca12179e35d271d26ce558e65fd0400eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 12:44:16 +0200
Subject: [PATCH 12/83] Update install

---
 scripts/install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index f7d23e4..72fce34 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,9 +80,9 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    corepack enable
-    corepack prepare pnpm@latest --activate
- 	ynh_exec_warn_less ynh_exec_as $app bin/installDeps.sh
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack enable
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+ 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
 popd
 
 #=================================================

From d13d2baad78715fbd4d6f8fd448b5c31e1d6c594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 12:47:04 +0200
Subject: [PATCH 13/83] Update install

---
 scripts/install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 72fce34..1279a41 100644
--- a/scripts/install
+++ b/scripts/install
@@ -82,7 +82,9 @@ pushd $install_dir
     ynh_use_nodejs
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack enable
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
- 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
+    rm -f var/minified*
+ 	#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
 popd
 
 #=================================================

From b16bcfb721e313952c30cad9bc7b05a7438f0f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 12:48:55 +0200
Subject: [PATCH 14/83] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 1279a41..b72022a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,8 +80,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack enable
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+    corepack enable
+    corepack prepare pnpm@latest --activate
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
     rm -f var/minified*
  	#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh

From c8613680893df054e8a2963a38bd25e396a6dc80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 12:52:24 +0200
Subject: [PATCH 15/83] Update install

---
 scripts/install | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index b72022a..f50cd44 100644
--- a/scripts/install
+++ b/scripts/install
@@ -82,9 +82,7 @@ pushd $install_dir
     ynh_use_nodejs
     corepack enable
     corepack prepare pnpm@latest --activate
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
-    rm -f var/minified*
- 	#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
 popd
 
 #=================================================

From 624ea8a4986f52522afc4d5898068fe2d606202b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 15:52:07 +0200
Subject: [PATCH 16/83] Update install

---
 scripts/install | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index f50cd44..2503293 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,9 +80,11 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    corepack enable
-    corepack prepare pnpm@latest --activate
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack enable
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+    #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
+    rm -f var/minified*
 popd
 
 #=================================================

From 0e0ca393ed2e132178bf777f70307e18c789cf60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 16:06:15 +0200
Subject: [PATCH 17/83] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 2503293..b13ebc8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,8 +80,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack enable
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+    corepack enable
+    corepack prepare pnpm@latest --activate
     #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
     rm -f var/minified*

From 7993a9f63a8a4b2d0f1976a3a7da3963130a9be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 16:45:45 +0200
Subject: [PATCH 18/83] Update install

---
 scripts/install | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index b13ebc8..269c4bf 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,9 +80,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    corepack enable
-    corepack prepare pnpm@latest --activate
-    #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
+    env $ynh_node_load_PATH corepack enable
+    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
     rm -f var/minified*
 popd

From a4bd5d318af7bc416b59c1e3533c8e901d8b3787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 16:46:19 +0200
Subject: [PATCH 19/83] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 269c4bf..dadf83d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -82,8 +82,8 @@ pushd $install_dir
     ynh_use_nodejs
     env $ynh_node_load_PATH corepack enable
     env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
-    rm -f var/minified*
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
+    #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
 popd
 
 #=================================================

From feaaeb0af26eeecff78c1aeb806619d986c03cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 12 May 2024 23:50:35 +0200
Subject: [PATCH 20/83] Update install

---
 scripts/install | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/install b/scripts/install
index 0a0f018..a3ec3cd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -84,6 +84,13 @@ pushd $install_dir
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 
+#Buiding admin
+pushd $install_dir/admin
+ynh_use_nodejs
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm build
+    mv $install_dir/admin/dist $install_dir/src/templates/admin/
+popd
+
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

From 18b71fb531f2a8d28d5fdedf906fe17fbcb6dc32 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 12 May 2024 21:50:40 +0000
Subject: [PATCH 21/83] Auto-update READMEs

---
 ALL_README.md |  1 +
 README_es.md  | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 README_es.md

diff --git a/ALL_README.md b/ALL_README.md
index a01b345..8938aae 100644
--- a/ALL_README.md
+++ b/ALL_README.md
@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lee el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
diff --git a/README_es.md b/README_es.md
new file mode 100644
index 0000000..39955f8
--- /dev/null
+++ b/README_es.md
@@ -0,0 +1,53 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Etherpad para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)
+
+[![Instalar Etherpad con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarEtherpad rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+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.
+This version of Etherpad is installed without plugins and uses Redis as database.
+Be aware, Redis database backup and restore is not fully implemented.
+If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
+
+
+**Versión actual:** 2.0.3~ynh1
+
+**Demo:** <https://video.etherpad.com/>
+
+## Capturas
+
+![Captura de Etherpad](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://etherpad.org/>
+- Documentación administrador oficial: <https://etherpad.org/doc/v2.0.2/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/ether/etherpad-lite>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/etherpad>
+- Reportar un error: <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade etherpad -u https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

From cba3942ee5dbad94db105d9074ac680b5573abd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 13 May 2024 19:20:05 +0200
Subject: [PATCH 22/83] Update install

---
 scripts/install | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index a3ec3cd..9ada303 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,14 +80,15 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    ynh_exec_warn_less npm install pnpm -g
+    corepack enable && corepack prepare pnpm@latest --activate
+    #ynh_exec_warn_less npm install pnpm -g
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 
 #Buiding admin
 pushd $install_dir/admin
 ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm build
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack pnpm build
     mv $install_dir/admin/dist $install_dir/src/templates/admin/
 popd
 

From 0afe98e113fe47c839ad5544947aba89a481ba82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 17 May 2024 21:45:49 +0200
Subject: [PATCH 23/83] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index dadf83d..4a36ff4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,8 +80,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
+    yes | env $ynh_node_load_PATH corepack enable
+    yes | env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
     #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
 popd

From f9f2f1c5c0c5b97616b52b5e31bbcd2a2d4562b0 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 17 May 2024 19:45:55 +0000
Subject: [PATCH 24/83] Auto-update READMEs

---
 ALL_README.md |  1 +
 README_es.md  | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 README_es.md

diff --git a/ALL_README.md b/ALL_README.md
index a01b345..8938aae 100644
--- a/ALL_README.md
+++ b/ALL_README.md
@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lee el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
diff --git a/README_es.md b/README_es.md
new file mode 100644
index 0000000..39955f8
--- /dev/null
+++ b/README_es.md
@@ -0,0 +1,53 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Etherpad para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)
+
+[![Instalar Etherpad con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarEtherpad rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+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.
+This version of Etherpad is installed without plugins and uses Redis as database.
+Be aware, Redis database backup and restore is not fully implemented.
+If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
+
+
+**Versión actual:** 2.0.3~ynh1
+
+**Demo:** <https://video.etherpad.com/>
+
+## Capturas
+
+![Captura de Etherpad](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://etherpad.org/>
+- Documentación administrador oficial: <https://etherpad.org/doc/v2.0.2/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/ether/etherpad-lite>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/etherpad>
+- Reportar un error: <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade etherpad -u https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

From a119de33d1cae44ef4a12b92268fee21ff80fd9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 17 May 2024 22:20:19 +0200
Subject: [PATCH 25/83] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 4a36ff4..dadf83d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,8 +80,8 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    yes | env $ynh_node_load_PATH corepack enable
-    yes | env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
+    env $ynh_node_load_PATH corepack enable
+    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
     #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
 popd

From 694de11df50b23a4edcc99d2cb26d3149c4403e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 07:28:12 +0200
Subject: [PATCH 26/83] cleaning

---
 manifest.toml      |  2 +-
 scripts/_common.sh | 39 ---------------------------------------
 scripts/install    |  2 +-
 3 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 8b26ec8..f2258f7 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/"
 code = "https://github.com/ether/etherpad-lite"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.12"
 architectures = "all"
 multi_instance = true
 
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2b9094e..184eecc 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -17,42 +17,3 @@ nodejs_version=22
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
-
-# get the first available redis database
-#
-# usage: ynh_redis_get_free_db
-# | returns: the database number to use
-ynh_redis_get_free_db() {
-    local result max db
-    result="$(redis-cli INFO keyspace)"
-
-    # get the num
-    max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
-
-    db=0
-    # default Debian setting is 15 databases
-    for i in $(seq 0 "$max")
-    do
-        if ! echo "$result" | grep -q "db$i"
-        then
-            db=$i
-            break 1
-        fi
-        db=-1
-    done
-
-    test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
-
-    echo "$db"
-}
-
-# Create a master password and set up global settings
-# Please always call this script in install and restore scripts
-#
-# usage: ynh_redis_remove_db database
-# | arg: database - the database to erase
-ynh_redis_remove_db() {
-    local db=$1
-    redis-cli -n "$db" flushall
-}
-
diff --git a/scripts/install b/scripts/install
index c5b73ee..52a0006 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
     ynh_use_nodejs
     env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
+    env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
     #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
 popd

From e9170d8eb4c0d70fff4772a4c4b722ac4a223159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 07:36:16 +0200
Subject: [PATCH 27/83] Update upgrade

---
 scripts/upgrade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 5bf3b4d..38ee257 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -101,7 +101,8 @@ ynh_script_progression --message="Installing $app..." --weight=60
 
 pushd $install_dir
  	ynh_use_nodejs
- 	ynh_exec_warn_less npm install pnpm -g
+    env $ynh_node_load_PATH corepack enable
+    env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 

From 26b7b70322fe62e8cf75811aa0261506a8f0b2ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 15:46:52 +0200
Subject: [PATCH 28/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 52a0006..c5b73ee 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
     ynh_use_nodejs
     env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
     #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
 popd

From 5cea0ec8eff1b60d1135a88e4f3c50834a4d63dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 15:55:33 +0200
Subject: [PATCH 29/83] Update _common.sh

---
 scripts/_common.sh | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2b9094e..184eecc 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -17,42 +17,3 @@ nodejs_version=22
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
-
-# get the first available redis database
-#
-# usage: ynh_redis_get_free_db
-# | returns: the database number to use
-ynh_redis_get_free_db() {
-    local result max db
-    result="$(redis-cli INFO keyspace)"
-
-    # get the num
-    max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
-
-    db=0
-    # default Debian setting is 15 databases
-    for i in $(seq 0 "$max")
-    do
-        if ! echo "$result" | grep -q "db$i"
-        then
-            db=$i
-            break 1
-        fi
-        db=-1
-    done
-
-    test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
-
-    echo "$db"
-}
-
-# Create a master password and set up global settings
-# Please always call this script in install and restore scripts
-#
-# usage: ynh_redis_remove_db database
-# | arg: database - the database to erase
-ynh_redis_remove_db() {
-    local db=$1
-    redis-cli -n "$db" flushall
-}
-

From bbdb1a7ee1faea722726328c30dc2ac86d3525fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 15:56:48 +0200
Subject: [PATCH 30/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index c5b73ee..52a0006 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
     ynh_use_nodejs
     env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
+    env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
     #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
 popd

From 53c00159767753fa47d66901410feaa84a7348b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 15:57:06 +0200
Subject: [PATCH 31/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 52a0006..97301f8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -82,7 +82,7 @@ pushd $install_dir
     ynh_use_nodejs
     env $ynh_node_load_PATH corepack enable
     env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
+    env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
     #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
 popd
 

From 1be283c47e4b7cccddae652214a451427dfa2632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 16:13:36 +0200
Subject: [PATCH 32/83] 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 184eecc..63277da 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-nodejs_version=22
+nodejs_version=21
 
 #=================================================
 # PERSONAL HELPERS

From bde1c69ede9c02bd36d2b93c7f9733e732ce326d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 16:15:15 +0200
Subject: [PATCH 33/83] fix

---
 scripts/_common.sh | 2 +-
 scripts/install    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 63277da..184eecc 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-nodejs_version=21
+nodejs_version=22
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 97301f8..be6ad4c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,6 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
+    npm install typescript -g
     env $ynh_node_load_PATH corepack enable
     env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
     env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh

From 1fce751123d5f14b19471b89b11230805d062564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 17:01:55 +0200
Subject: [PATCH 34/83] Update install

---
 scripts/install | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index be6ad4c..97301f8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,7 +80,6 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    npm install typescript -g
     env $ynh_node_load_PATH corepack enable
     env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
     env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh

From 286adc2f6626abccb42f214b1fd5aa7e4a091a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 9 May 2024 21:55:00 +0200
Subject: [PATCH 35/83] Update credentials.json

---
 conf/credentials.json | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/conf/credentials.json b/conf/credentials.json
index 5655057..3925100 100644
--- a/conf/credentials.json
+++ b/conf/credentials.json
@@ -27,11 +27,23 @@
         "database": "__REDIS_DB__"  
    },
 
-  /*
-   * Users for basic authentication.
+    /*
+   * User accounts. These accounts are used by:
+   *   - default HTTP basic authentication if no plugin handles authentication
+   *   - some but not all authentication plugins
+   *   - some but not all authorization plugins
    *
-   * is_admin = true gives access to /admin.
-   * If you do not uncomment this, /admin will not be available!
+   * User properties:
+   *   - password: The user's password. Some authentication plugins will ignore
+   *     this.
+   *   - is_admin: true gives access to /admin. Defaults to false. If you do not
+   *     uncomment this, /admin will not be available!
+   *   - readOnly: If true, this user will not be able to create new pads or
+   *     modify existing pads. Defaults to false.
+   *   - canCreate: If this is true and readOnly is false, this user can create
+   *     new pads. Defaults to true.
+   *
+   * Authentication and authorization plugins may define additional properties.
    *
    * WARNING: passwords should not be stored in plaintext in this file.
    *          If you want to mitigate this, please install ep_hash_auth and

From d70f5c48dc8b3dc7dbd43fba96b3f7328a775ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 12 May 2024 23:50:35 +0200
Subject: [PATCH 36/83] Update install

---
 scripts/install | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/install b/scripts/install
index 0a0f018..a3ec3cd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -84,6 +84,13 @@ pushd $install_dir
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 
+#Buiding admin
+pushd $install_dir/admin
+ynh_use_nodejs
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm build
+    mv $install_dir/admin/dist $install_dir/src/templates/admin/
+popd
+
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

From 25f7bb0aa2bd85c23b0bd5b18d73f9cfab73dd29 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 12 May 2024 21:50:40 +0000
Subject: [PATCH 37/83] Auto-update READMEs

---
 ALL_README.md |  1 +
 README_es.md  | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 README_es.md

diff --git a/ALL_README.md b/ALL_README.md
index a01b345..8938aae 100644
--- a/ALL_README.md
+++ b/ALL_README.md
@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lee el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
diff --git a/README_es.md b/README_es.md
new file mode 100644
index 0000000..39955f8
--- /dev/null
+++ b/README_es.md
@@ -0,0 +1,53 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Etherpad para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)
+
+[![Instalar Etherpad con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarEtherpad rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+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.
+This version of Etherpad is installed without plugins and uses Redis as database.
+Be aware, Redis database backup and restore is not fully implemented.
+If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
+
+
+**Versión actual:** 2.0.3~ynh1
+
+**Demo:** <https://video.etherpad.com/>
+
+## Capturas
+
+![Captura de Etherpad](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://etherpad.org/>
+- Documentación administrador oficial: <https://etherpad.org/doc/v2.0.2/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/ether/etherpad-lite>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/etherpad>
+- Reportar un error: <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade etherpad -u https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

From acf43a43235d737cf4d7afa24631adb280bfac40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 13 May 2024 19:20:05 +0200
Subject: [PATCH 38/83] Update install

---
 scripts/install | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index a3ec3cd..9ada303 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,14 +80,15 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    ynh_exec_warn_less npm install pnpm -g
+    corepack enable && corepack prepare pnpm@latest --activate
+    #ynh_exec_warn_less npm install pnpm -g
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 
 #Buiding admin
 pushd $install_dir/admin
 ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm build
+    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack pnpm build
     mv $install_dir/admin/dist $install_dir/src/templates/admin/
 popd
 

From d8a991973c30696ab728de93284a6ba874f5ee13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 15:55:33 +0200
Subject: [PATCH 39/83] Update _common.sh

---
 scripts/_common.sh | 39 ---------------------------------------
 1 file changed, 39 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2b9094e..184eecc 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -17,42 +17,3 @@ nodejs_version=22
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
-
-# get the first available redis database
-#
-# usage: ynh_redis_get_free_db
-# | returns: the database number to use
-ynh_redis_get_free_db() {
-    local result max db
-    result="$(redis-cli INFO keyspace)"
-
-    # get the num
-    max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
-
-    db=0
-    # default Debian setting is 15 databases
-    for i in $(seq 0 "$max")
-    do
-        if ! echo "$result" | grep -q "db$i"
-        then
-            db=$i
-            break 1
-        fi
-        db=-1
-    done
-
-    test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
-
-    echo "$db"
-}
-
-# Create a master password and set up global settings
-# Please always call this script in install and restore scripts
-#
-# usage: ynh_redis_remove_db database
-# | arg: database - the database to erase
-ynh_redis_remove_db() {
-    local db=$1
-    redis-cli -n "$db" flushall
-}
-

From e2b83245d5e59b9814155fdd8a156b99ea10ffca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Mon, 20 May 2024 20:43:14 +0200
Subject: [PATCH 40/83] Use standard redis helpers

---
 manifest.toml      |  7 +++----
 scripts/_common.sh | 39 ---------------------------------------
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 8b26ec8..8cf44bd 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/"
 code = "https://github.com/ether/etherpad-lite"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.12"
 architectures = "all"
 multi_instance = true
 
@@ -82,14 +82,13 @@ ram.runtime = "50M"
 
     [resources.apt]
     packages = ""
-    
+
     packages_from_raw_bash = """
           if [[ "$export" == "libreoffice" ]]
-          then 
+          then
               echo "unoconv libreoffice-writer"
           elif [[ "$export" == "abiword" ]]
           then
               echo "abiword"
           fi
     """
-    
\ No newline at end of file
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2b9094e..184eecc 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -17,42 +17,3 @@ nodejs_version=22
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
-
-# get the first available redis database
-#
-# usage: ynh_redis_get_free_db
-# | returns: the database number to use
-ynh_redis_get_free_db() {
-    local result max db
-    result="$(redis-cli INFO keyspace)"
-
-    # get the num
-    max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
-
-    db=0
-    # default Debian setting is 15 databases
-    for i in $(seq 0 "$max")
-    do
-        if ! echo "$result" | grep -q "db$i"
-        then
-            db=$i
-            break 1
-        fi
-        db=-1
-    done
-
-    test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
-
-    echo "$db"
-}
-
-# Create a master password and set up global settings
-# Please always call this script in install and restore scripts
-#
-# usage: ynh_redis_remove_db database
-# | arg: database - the database to erase
-ynh_redis_remove_db() {
-    local db=$1
-    redis-cli -n "$db" flushall
-}
-

From 4b8f9a0bf06ef58f89a99a512e637e6109df662b Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Mon, 20 May 2024 18:43:24 +0000
Subject: [PATCH 41/83] Auto-update READMEs

---
 ALL_README.md |  1 +
 README_es.md  | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 README_es.md

diff --git a/ALL_README.md b/ALL_README.md
index a01b345..8938aae 100644
--- a/ALL_README.md
+++ b/ALL_README.md
@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lee el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
diff --git a/README_es.md b/README_es.md
new file mode 100644
index 0000000..39955f8
--- /dev/null
+++ b/README_es.md
@@ -0,0 +1,53 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Etherpad para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)
+
+[![Instalar Etherpad con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarEtherpad rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+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.
+This version of Etherpad is installed without plugins and uses Redis as database.
+Be aware, Redis database backup and restore is not fully implemented.
+If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
+
+
+**Versión actual:** 2.0.3~ynh1
+
+**Demo:** <https://video.etherpad.com/>
+
+## Capturas
+
+![Captura de Etherpad](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://etherpad.org/>
+- Documentación administrador oficial: <https://etherpad.org/doc/v2.0.2/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/ether/etherpad-lite>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/etherpad>
+- Reportar un error: <https://github.com/YunoHost-Apps/etherpad_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade etherpad -u https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

From b430dca141fc9601bc8eb7fbd6ff080195876257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 20 May 2024 23:16:47 +0200
Subject: [PATCH 42/83] clean

---
 manifest.toml   |  2 +-
 scripts/install | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 8b26ec8..f2258f7 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/"
 code = "https://github.com/ether/etherpad-lite"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.12"
 architectures = "all"
 multi_instance = true
 
diff --git a/scripts/install b/scripts/install
index 9ada303..65be154 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,17 +80,17 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    corepack enable && corepack prepare pnpm@latest --activate
-    #ynh_exec_warn_less npm install pnpm -g
+    ynh_exec_warn_less npm install pnpm -g
+    #corepack enable && corepack prepare pnpm@latest --activate
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 
 #Buiding admin
-pushd $install_dir/admin
-ynh_use_nodejs
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack pnpm build
-    mv $install_dir/admin/dist $install_dir/src/templates/admin/
-popd
+#pushd $install_dir/admin
+#ynh_use_nodejs
+#    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack pnpm build
+#    mv $install_dir/admin/dist $install_dir/src/templates/admin/
+#popd
 
 #=================================================
 # START SYSTEMD SERVICE

From d2573ee4e64dc056daa0f9921ddaaa40d6666252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 2 Jun 2024 13:28:12 +0200
Subject: [PATCH 43/83] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 8cf44bd..951e097 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Etherpad"
 description.en = "Collaborative editing in real-time"
 description.fr = "Édition collaborative en temps réel"
 
-version = "2.0.3~ynh1"
+version = "2.1.0~ynh1"
 
 maintainers = ["eric_G"]
 
@@ -63,8 +63,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.3.tar.gz"
-        sha256 = "6dc19addc8280806590f9a82d4426a88a8ef77c7841f99f97a50d6aa6c9ecc1a"
+        url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.1.0.tar.gz"
+        sha256 = "68a238852b82088a539228fb83eb4efa6599da163e6a3214e5cf15144a50ec49"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.ports]

From bf923311df6b63039c1a1bb598d790c1a6e40a7d Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 2 Jun 2024 11:28:18 +0000
Subject: [PATCH 44/83] Auto-update READMEs

---
 ALL_README.md     | 2 +-
 README.md         | 2 +-
 README_es.md      | 2 +-
 README_eu.md      | 2 +-
 README_fr.md      | 2 +-
 README_gl.md      | 2 +-
 README_zh_Hans.md | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ALL_README.md b/ALL_README.md
index 8938aae..152f2e7 100644
--- a/ALL_README.md
+++ b/ALL_README.md
@@ -1,7 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
-- [Lee el README en español](README_es.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
diff --git a/README.md b/README.md
index 99ba42d..aced0a8 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Shipped version:** 2.0.3~ynh1
+**Shipped version:** 2.1.0~ynh1
 
 **Demo:** <https://video.etherpad.com/>
 
diff --git a/README_es.md b/README_es.md
index 39955f8..d101b2e 100644
--- a/README_es.md
+++ b/README_es.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Versión actual:** 2.0.3~ynh1
+**Versión actual:** 2.1.0~ynh1
 
 **Demo:** <https://video.etherpad.com/>
 
diff --git a/README_eu.md b/README_eu.md
index 812b63f..3b188d8 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Paketatutako bertsioa:** 2.0.3~ynh1
+**Paketatutako bertsioa:** 2.1.0~ynh1
 
 **Demoa:** <https://video.etherpad.com/>
 
diff --git a/README_fr.md b/README_fr.md
index 00285ae..b7c03eb 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont
 Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Version incluse :** 2.0.3~ynh1
+**Version incluse :** 2.1.0~ynh1
 
 **Démo :** <https://video.etherpad.com/>
 
diff --git a/README_gl.md b/README_gl.md
index 442625d..5a42d01 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Versión proporcionada:** 2.0.3~ynh1
+**Versión proporcionada:** 2.1.0~ynh1
 
 **Demo:** <https://video.etherpad.com/>
 
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index c38ac7c..607540e 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**分发版本：** 2.0.3~ynh1
+**分发版本：** 2.1.0~ynh1
 
 **演示：** <https://video.etherpad.com/>
 

From b1de8174e0bc57275dd9257596a614ab7717b597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 2 Jun 2024 14:38:19 +0200
Subject: [PATCH 45/83] Update install

---
 scripts/install | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/scripts/install b/scripts/install
index 65be154..314dc77 100644
--- a/scripts/install
+++ b/scripts/install
@@ -85,13 +85,6 @@ pushd $install_dir
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
 popd
 
-#Buiding admin
-#pushd $install_dir/admin
-#ynh_use_nodejs
-#    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack pnpm build
-#    mv $install_dir/admin/dist $install_dir/src/templates/admin/
-#popd
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

From d4dab59b7b049de0e6123254302dcce5a2203249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 6 Jun 2024 11:20:57 +0200
Subject: [PATCH 46/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 7d20c5f..dd61b7e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -82,7 +82,7 @@ pushd $install_dir
     ynh_use_nodejs
     env $ynh_node_load_PATH corepack enable
     env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
-    env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
+    env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
     #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
 popd
 

From 4125212c09220dbf5c204f72da9b4ca63c85e142 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Thu, 6 Jun 2024 09:21:03 +0000
Subject: [PATCH 47/83] Auto-update READMEs

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

diff --git a/ALL_README.md b/ALL_README.md
index 8938aae..152f2e7 100644
--- a/ALL_README.md
+++ b/ALL_README.md
@@ -1,7 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
-- [Lee el README en español](README_es.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)

From eb22f4d874e565fa87392ecb1a4a17db0abca9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 6 Jun 2024 11:27:38 +0200
Subject: [PATCH 48/83] fix

---
 scripts/install | 7 +++----
 scripts/upgrade | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/install b/scripts/install
index dd61b7e..62ec041 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,10 +80,9 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
-    env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
-    #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 38ee257..0335593 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -97,13 +97,13 @@ chown $app:$app "$install_dir/credentials.json"
 #=================================================
 # INSTALL ETHERPAD
 #=================================================
-ynh_script_progression --message="Installing $app..." --weight=60
+ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    env $ynh_node_load_PATH corepack enable
-    env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
- 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+ 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
 #=================================================

From 9e9aae305a91cdb02ff56b180e306b4a6088fe50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 6 Jun 2024 13:45:22 +0200
Subject: [PATCH 49/83] cleaning

---
 manifest.toml   | 2 +-
 scripts/install | 3 +--
 scripts/upgrade | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 951e097..272813a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/"
 code = "https://github.com/ether/etherpad-lite"
 
 [integration]
-yunohost = ">= 11.2.12"
+yunohost = ">= 11.2.14"
 architectures = "all"
 multi_instance = true
 
diff --git a/scripts/install b/scripts/install
index 62ec041..48f2a59 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,8 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate
     ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 0335593..49f5e62 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -101,8 +101,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack prepare pnpm@latest --activate
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 

From 959e85521f35d01aac4cbafdf236a3ef543c463c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 6 Jun 2024 14:04:15 +0200
Subject: [PATCH 50/83] fix

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

diff --git a/scripts/install b/scripts/install
index 48f2a59..23d8d2f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,7 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
     ynh_use_nodejs
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
     ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 49f5e62..ec9e664 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -101,7 +101,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 
 pushd $install_dir
  	ynh_use_nodejs
-    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
  	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 

From 4c650573767f3616be6b62b8788fbf84298087c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 6 Jun 2024 16:43:47 +0200
Subject: [PATCH 51/83] Update restore

---
 scripts/restore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index 52de706..220299d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -32,9 +32,9 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=7
 
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-pushd $install_dir
- 	ynh_use_nodejs
-    ynh_exec_warn_less npm install pnpm -g
+pushd "$install_dir"
+    ynh_use_nodejs
+    ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
 popd
 
 #=================================================

From cd1c7678b3fe9416d02976c0c0411788b760af66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 6 Jun 2024 16:47:03 +0200
Subject: [PATCH 52/83] Update backup

---
 scripts/backup | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 312b053..e21c492 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -21,23 +21,13 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE
-#=================================================
-
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================

From 59a64f2635e603b0a73b7568f4ebd58f45bab78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 6 Jun 2024 21:36:09 +0200
Subject: [PATCH 53/83] Update settings.json

---
 conf/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/settings.json b/conf/settings.json
index 0bf1424..f061278 100644
--- a/conf/settings.json
+++ b/conf/settings.json
@@ -265,7 +265,7 @@
    * This will improve the loading performance massively, but makes it difficult
    * to debug the javascript/css
    */
-  "minify": true,
+  "minify": false,
 
   /*
    * How long may clients use served javascript code (in seconds)?

From 5500e1ce4265b71bc0b8073eb430f791680d853b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 13:23:12 +0200
Subject: [PATCH 54/83] fix

---
 doc/ADMIN.md    | 2 +-
 doc/ADMIN_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index f3d39fc..02204a0 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -1,3 +1,3 @@
-You can access Etherpad's admin panel at `__DOMAIN____PATH__admin`. The configuration file for Etherpad is at the path `__INSTALL_DIR__/settings.json`.
+You can access Etherpad's admin panel at `__DOMAIN____PATH__/admin`. The configuration file for Etherpad is at the path `__INSTALL_DIR__/settings.json`.
 
 *Skin Builder* (accessible at this address `__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `__INSTALL_DIR__/settings.json`.
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index d3a272e..d216b09 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,3 +1,3 @@
-Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `__DOMAIN____PATH__admin`. Le fichier de configuration d'Etherpad est `__INSTALL_DIR__/settings.json`.
+Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `__DOMAIN____PATH__/admin`. Le fichier de configuration d'Etherpad est `__INSTALL_DIR__/settings.json`.
 
 *Skin Builder* (accessible à l'adresse `__INSTALL_DIR__/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `__INSTALL_DIR__/settings.json`.

From 03c6ef41bff1f19bd6f8bce90380d2121fb3a9e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:04:57 +0200
Subject: [PATCH 55/83] Update nginx.conf

---
 conf/nginx.conf | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8ae2f3e..35bfc10 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,24 +1,18 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-    proxy_pass         http://127.0.0.1:__PORT__/;
+    proxy_pass         http://127.0.0.1:__PORT__;
+    proxy_buffering    off;
     proxy_set_header   Host $host;
     proxy_pass_header  Server;
 
-    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;
+    proxy_set_header    X-Real-IP $remote_addr;
+    proxy_set_header    X-Forwarded-For $remote_addr;
+    proxy_set_header    X-Forwarded-Proto $scheme;
+    proxy_http_version  1.1;
 
-    # Include SSOWAT user panel.
-    include conf.d/yunohost_panel.conf.inc;
+    proxy_set_header  Upgrade $http_upgrade;
+    proxy_set_header  Connection $connection_upgrade;
 }
 
 location ~* __PATH__/p/[^/]*(_|%|\*)[^/]*/export/etherpad {

From 337e002173a8ffa9d01b8fc7a0adb413abab9514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:17:26 +0200
Subject: [PATCH 56/83] Update install

---
 scripts/install | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/install b/scripts/install
index 23d8d2f..fbb42f7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -84,6 +84,12 @@ pushd $install_dir
     ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
+pushd $install_dir/admin
+    ynh_use_nodejs
+
+    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm build-copy
+popd
+
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

From b905a0b9c5dab6af7b414ffc83c3978ec4169e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:22:57 +0200
Subject: [PATCH 57/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index fbb42f7..e0d7297 100644
--- a/scripts/install
+++ b/scripts/install
@@ -87,7 +87,7 @@ popd
 pushd $install_dir/admin
     ynh_use_nodejs
 
-    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm build-copy
+    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run build-copy
 popd
 
 #=================================================

From bede2fb27bf4440e3d10b65a073b3f22ce8edcf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:25:21 +0200
Subject: [PATCH 58/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index e0d7297..af3e895 100644
--- a/scripts/install
+++ b/scripts/install
@@ -87,7 +87,7 @@ popd
 pushd $install_dir/admin
     ynh_use_nodejs
 
-    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run build-copy
+    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm install && pnpm run build-copy
 popd
 
 #=================================================

From e5ca2de3bb7104ea06aad17073c9563d07e4359f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:25:32 +0200
Subject: [PATCH 59/83] Update install

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

diff --git a/scripts/install b/scripts/install
index af3e895..28a04c0 100644
--- a/scripts/install
+++ b/scripts/install
@@ -85,8 +85,6 @@ pushd $install_dir
 popd
 
 pushd $install_dir/admin
-    ynh_use_nodejs
-
     ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm install && pnpm run build-copy
 popd
 

From 9021f154db2a52c9d4b52715a3d552f9b09a29bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:41:18 +0200
Subject: [PATCH 60/83] Update install

---
 scripts/install | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 28a04c0..42ba429 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,12 +81,13 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
     ynh_use_nodejs
     ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
-    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
+    #ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
+    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true pnpm --recursive i --production
 popd
 
-pushd $install_dir/admin
-    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm install && pnpm run build-copy
-popd
+#pushd $install_dir/admin
+#    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm install && pnpm run build-copy
+#popd
 
 #=================================================
 # START SYSTEMD SERVICE

From 816ce822c4432f4df2e729ccdd2668c6f511aa3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 19:47:53 +0200
Subject: [PATCH 61/83] fix

---
 conf/systemd.service | 5 ++---
 scripts/install      | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 559f1e1..a152a7b 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -7,11 +7,10 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-Environment=ETHERPAD_PRODUCTION=true
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__INSTALL_DIR__/bin/run.sh
-#ExecStart=pnpm run prod
+#ExecStart=__INSTALL_DIR__/bin/run.sh
+ExecStart=pnpm run prod
 Restart=always
 
 # Sandboxing options to harden security
diff --git a/scripts/install b/scripts/install
index 42ba429..81524ab 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,12 +81,11 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
     ynh_use_nodejs
     ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
-    #ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
     ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true pnpm --recursive i --production
 popd
 
 #pushd $install_dir/admin
-#    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm install && pnpm run build-copy
+#    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true pnpm install && pnpm run build-copy
 #popd
 
 #=================================================

From a5c7d0a423a313585adb1c4e75bdda407c6746ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:17:44 +0200
Subject: [PATCH 62/83] Update install

---
 scripts/install | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 81524ab..ed705e3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -84,10 +84,6 @@ pushd $install_dir
     ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true pnpm --recursive i --production
 popd
 
-#pushd $install_dir/admin
-#    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true pnpm install && pnpm run build-copy
-#popd
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

From b6b265faa2fb8a8ea512bf43349ef8342a08c611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:18:20 +0200
Subject: [PATCH 63/83] Update systemd.service

---
 conf/systemd.service | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index a152a7b..d2aa174 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -9,7 +9,6 @@ Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-#ExecStart=__INSTALL_DIR__/bin/run.sh
 ExecStart=pnpm run prod
 Restart=always
 

From 92ea5bd00c3d7fdba188f75ea6a896326a07ea95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:20:00 +0200
Subject: [PATCH 64/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index ed705e3..f025cac 100644
--- a/scripts/install
+++ b/scripts/install
@@ -17,7 +17,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=6
 ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
-# CREATE A POSTQRESQL DATABASE
+# CREATE REDIS DATABASE
 #=================================================
 ynh_script_progression --message="Creating a Redis database..." --weight=5
 

From e7f2f0f7b8a615ec2db0b9eb3259dc5f7d931821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:21:01 +0200
Subject: [PATCH 65/83] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index ec9e664..9921292 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -102,7 +102,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
  	ynh_use_nodejs
     ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
- 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
+ 	ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true pnpm --recursive i --production
 popd
 
 #=================================================

From 6a685e0ff49c9ead8a0c689a91c5f1ecf217a474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:34:15 +0200
Subject: [PATCH 66/83] fix

---
 doc/ADMIN.md    | 2 +-
 doc/ADMIN_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index 02204a0..f3d39fc 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -1,3 +1,3 @@
-You can access Etherpad's admin panel at `__DOMAIN____PATH__/admin`. The configuration file for Etherpad is at the path `__INSTALL_DIR__/settings.json`.
+You can access Etherpad's admin panel at `__DOMAIN____PATH__admin`. The configuration file for Etherpad is at the path `__INSTALL_DIR__/settings.json`.
 
 *Skin Builder* (accessible at this address `__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `__INSTALL_DIR__/settings.json`.
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index d216b09..d3a272e 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,3 +1,3 @@
-Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `__DOMAIN____PATH__/admin`. Le fichier de configuration d'Etherpad est `__INSTALL_DIR__/settings.json`.
+Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `__DOMAIN____PATH__admin`. Le fichier de configuration d'Etherpad est `__INSTALL_DIR__/settings.json`.
 
 *Skin Builder* (accessible à l'adresse `__INSTALL_DIR__/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `__INSTALL_DIR__/settings.json`.

From 939a80a8e02918c8efbf50265c903db40b8e99a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 20:35:59 +0200
Subject: [PATCH 67/83] Update PRE_INSTALL.md

---
 doc/PRE_INSTALL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md
index 01d67e0..a299eb4 100644
--- a/doc/PRE_INSTALL.md
+++ b/doc/PRE_INSTALL.md
@@ -1 +1 @@
-Please note, this package is only intended to test Etherpad with redis database. It should not be used for production.
\ No newline at end of file
+Please note, this package is only intended to test Etherpad with Redis database. It should not be used for production.
\ No newline at end of file

From 5c5826b246af5a6874091153499597cf8834b22b Mon Sep 17 00:00:00 2001
From: tituspijean <titus+yunohost@pijean.ovh>
Date: Fri, 7 Jun 2024 21:24:02 +0200
Subject: [PATCH 68/83] Fix service

---
 conf/systemd.service | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index d2aa174..51ce04b 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -9,8 +9,10 @@ Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=pnpm run prod
+ExecStart=__NODEJS_PATH__/pnpm run prod
 Restart=always
+StandardOutput=append:/var/log/etherpad/etherpad.log
+StandardError=inherit
 
 # Sandboxing options to harden security
 # Depending on specificities of your service/app, you may need to tweak these 

From ea85c7c2ca55b840a6663776ee1ad514cdf2ac8f Mon Sep 17 00:00:00 2001
From: tituspijean <titus+yunohost@pijean.ovh>
Date: Fri, 7 Jun 2024 21:25:28 +0200
Subject: [PATCH 69/83] Fix NGINX proxy conf

---
 conf/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 35bfc10..e8bc01d 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,7 +1,7 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
-    proxy_pass         http://127.0.0.1:__PORT__;
+    proxy_pass         http://127.0.0.1:__PORT__/;
     proxy_buffering    off;
     proxy_set_header   Host $host;
     proxy_pass_header  Server;

From 956b3e52093af201186b855f9dfbbf7ff25e2c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:21:23 +0200
Subject: [PATCH 70/83] Update systemd.service

---
 conf/systemd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 51ce04b..1fb17c6 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -9,7 +9,7 @@ Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__NODEJS_PATH__/pnpm run prod
+ExecStart=__INSTALL_DIR__/bin/run.sh
 Restart=always
 StandardOutput=append:/var/log/etherpad/etherpad.log
 StandardError=inherit

From 037bdda33912ec5080dc28af99f7dc3c34be17ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:24:04 +0200
Subject: [PATCH 71/83] Update systemd.service

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

diff --git a/conf/systemd.service b/conf/systemd.service
index 1fb17c6..f79a12c 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -9,6 +9,7 @@ Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
+Environment="ETHERPAD_PRODUCTION=true"
 ExecStart=__INSTALL_DIR__/bin/run.sh
 Restart=always
 StandardOutput=append:/var/log/etherpad/etherpad.log

From 86459f4dd4242818bf97aea46d5b99163800b66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:25:38 +0200
Subject: [PATCH 72/83] fix

---
 conf/nginx.conf      | 20 +++++++++++++-------
 conf/systemd.service |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index e8bc01d..8ae2f3e 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -2,17 +2,23 @@
 location __PATH__/ {
 
     proxy_pass         http://127.0.0.1:__PORT__/;
-    proxy_buffering    off;
     proxy_set_header   Host $host;
     proxy_pass_header  Server;
 
-    proxy_set_header    X-Real-IP $remote_addr;
-    proxy_set_header    X-Forwarded-For $remote_addr;
-    proxy_set_header    X-Forwarded-Proto $scheme;
-    proxy_http_version  1.1;
+    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;
 
-    proxy_set_header  Upgrade $http_upgrade;
-    proxy_set_header  Connection $connection_upgrade;
+    # Include SSOWAT user panel.
+    include conf.d/yunohost_panel.conf.inc;
 }
 
 location ~* __PATH__/p/[^/]*(_|%|\*)[^/]*/export/etherpad {
diff --git a/conf/systemd.service b/conf/systemd.service
index f79a12c..41a9091 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -12,8 +12,8 @@ Environment="__YNH_NODE_LOAD_PATH__"
 Environment="ETHERPAD_PRODUCTION=true"
 ExecStart=__INSTALL_DIR__/bin/run.sh
 Restart=always
-StandardOutput=append:/var/log/etherpad/etherpad.log
-StandardError=inherit
+#StandardOutput=append:/var/log/etherpad/etherpad.log
+#StandardError=inherit
 
 # Sandboxing options to harden security
 # Depending on specificities of your service/app, you may need to tweak these 

From 47944295b82e4b662f8f16f1f50a36c01882df99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:32:47 +0200
Subject: [PATCH 73/83] cleaning

---
 conf/systemd.service |  4 +---
 scripts/install      | 10 +++++-----
 scripts/restore      |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 41a9091..39c863b 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -7,13 +7,11 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
+Environment="ETHERPAD_PRODUCTION=true"
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-Environment="ETHERPAD_PRODUCTION=true"
 ExecStart=__INSTALL_DIR__/bin/run.sh
 Restart=always
-#StandardOutput=append:/var/log/etherpad/etherpad.log
-#StandardError=inherit
 
 # Sandboxing options to harden security
 # Depending on specificities of your service/app, you may need to tweak these 
diff --git a/scripts/install b/scripts/install
index f025cac..344dcc8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -36,9 +36,9 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
-# SETUP SYSTEMD
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=4
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 ynh_add_systemd_config
 
@@ -49,9 +49,9 @@ ynh_use_logrotate
 yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/$app.log"
 
 #=================================================
-# MODIFY A CONFIG FILE
+# APP INITIAL CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring $app..." --weight=6
+ynh_script_progression --message="Adding $app's configuration files..." --weight=1
 
 abiword_path="null"
 soffice_path="null"
@@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
     ynh_use_nodejs
     ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
-    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true pnpm --recursive i --production
+    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 220299d..1c79226 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -38,9 +38,9 @@ pushd "$install_dir"
 popd
 
 #=================================================
-# RESTORE SYSTEMD
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=8
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet

From f49c0cd98f0e1d3dacac4df678c261df204733c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:33:36 +0200
Subject: [PATCH 74/83] Update settings.json

---
 conf/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/settings.json b/conf/settings.json
index f061278..0bf1424 100644
--- a/conf/settings.json
+++ b/conf/settings.json
@@ -265,7 +265,7 @@
    * This will improve the loading performance massively, but makes it difficult
    * to debug the javascript/css
    */
-  "minify": false,
+  "minify": true,
 
   /*
    * How long may clients use served javascript code (in seconds)?

From 04996ef890196e532550b4dbf792e29e59041708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:34:29 +0200
Subject: [PATCH 75/83] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 9921292..ac5a20f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -102,7 +102,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
  	ynh_use_nodejs
     ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
- 	ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true pnpm --recursive i --production
+ 	ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
 #=================================================

From 266de5dfd121f3aa8c0d554d9df0a29103583323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:35:04 +0200
Subject: [PATCH 76/83] Update manifest.toml

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

diff --git a/manifest.toml b/manifest.toml
index 272813a..c910003 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Etherpad"
 description.en = "Collaborative editing in real-time"
 description.fr = "Édition collaborative en temps réel"
 
-version = "2.1.0~ynh1"
+version = "2.1.0~ynh2"
 
 maintainers = ["eric_G"]
 

From ded66c87c46ee59a390f9e2cdbfe5bb374749456 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Fri, 7 Jun 2024 20:35:09 +0000
Subject: [PATCH 77/83] Auto-update READMEs

---
 README.md         | 2 +-
 README_es.md      | 2 +-
 README_eu.md      | 2 +-
 README_fr.md      | 2 +-
 README_gl.md      | 2 +-
 README_zh_Hans.md | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index aced0a8..b7e1bcd 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Shipped version:** 2.1.0~ynh1
+**Shipped version:** 2.1.0~ynh2
 
 **Demo:** <https://video.etherpad.com/>
 
diff --git a/README_es.md b/README_es.md
index d101b2e..018271b 100644
--- a/README_es.md
+++ b/README_es.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Versión actual:** 2.1.0~ynh1
+**Versión actual:** 2.1.0~ynh2
 
 **Demo:** <https://video.etherpad.com/>
 
diff --git a/README_eu.md b/README_eu.md
index 3b188d8..a6793c9 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Paketatutako bertsioa:** 2.1.0~ynh1
+**Paketatutako bertsioa:** 2.1.0~ynh2
 
 **Demoa:** <https://video.etherpad.com/>
 
diff --git a/README_fr.md b/README_fr.md
index b7c03eb..c56ba98 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont
 Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Version incluse :** 2.1.0~ynh1
+**Version incluse :** 2.1.0~ynh2
 
 **Démo :** <https://video.etherpad.com/>
 
diff --git a/README_gl.md b/README_gl.md
index 5a42d01..b71d710 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**Versión proporcionada:** 2.1.0~ynh1
+**Versión proporcionada:** 2.1.0~ynh2
 
 **Demo:** <https://video.etherpad.com/>
 
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 607540e..52edbf5 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented.
 If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh",
 
 
-**分发版本：** 2.1.0~ynh1
+**分发版本：** 2.1.0~ynh2
 
 **演示：** <https://video.etherpad.com/>
 

From b974313d0bc66819834936a249052b2c3335cb45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:41:48 +0200
Subject: [PATCH 78/83] Update nginx.conf

---
 conf/nginx.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8ae2f3e..0217f01 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -7,11 +7,11 @@ location __PATH__/ {
 
     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
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $remote_addr;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header Host $host;
+    proxy_http_version 1.1;
   
     # WebSocket proxying - from http://nginx.org/en/docs/http/websocket.html
     proxy_set_header Upgrade $http_upgrade;

From f7cd8a5ccb4c6b1c8fb5653e39e960af7d75b926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:49:32 +0200
Subject: [PATCH 79/83] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 344dcc8..fe5402a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
     ynh_use_nodejs
     ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
-    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
+    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=1 COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
 popd
 
 #=================================================

From be1621968da9091e7ac6c9e0f0bb6ff96f6d41b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 22:56:52 +0200
Subject: [PATCH 80/83] fix

---
 conf/systemd.service | 2 +-
 scripts/install      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 39c863b..8c84f18 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -7,7 +7,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-Environment="ETHERPAD_PRODUCTION=true"
+Environment="ETHERPAD_PRODUCTION=1"
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
 ExecStart=__INSTALL_DIR__/bin/run.sh
diff --git a/scripts/install b/scripts/install
index fe5402a..5a05fb7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10
 pushd $install_dir
     ynh_use_nodejs
     ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate
-    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=1 COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh
+    ynh_exec_warn_less env $ynh_node_load_PATH ETHERPAD_PRODUCTION=1 COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm --recursive i --production
 popd
 
 #=================================================

From ce5af2a9293e50b701307d5d7cc8df6cd47e1d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 23:08:35 +0200
Subject: [PATCH 81/83] Update systemd.service

---
 conf/systemd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 8c84f18..e5a1e68 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -10,7 +10,7 @@ WorkingDirectory=__INSTALL_DIR__/
 Environment="ETHERPAD_PRODUCTION=1"
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__INSTALL_DIR__/bin/run.sh
+ExecStart=__NODEJS_PATH__/pnpm run prod
 Restart=always
 
 # Sandboxing options to harden security

From 21e5e7d34ad86626d005581aba552a1b8c8c2239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 23:17:37 +0200
Subject: [PATCH 82/83] 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 184eecc..9195d57 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-nodejs_version=22
+nodejs_version=18
 
 #=================================================
 # PERSONAL HELPERS

From 2b65e103fc23a62a928058ac90d59a06bbca0c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 23:22:18 +0200
Subject: [PATCH 83/83] Update systemd.service

---
 conf/systemd.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index e5a1e68..5210a9e 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -10,7 +10,8 @@ WorkingDirectory=__INSTALL_DIR__/
 Environment="ETHERPAD_PRODUCTION=1"
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__NODEJS_PATH__/pnpm run prod
+ExecStart=__INSTALL_DIR__/bin/run.sh
+#ExecStart=__NODEJS_PATH__/pnpm run prod
 Restart=always
 
 # Sandboxing options to harden security