From 4e00368659bf3e1017c578f25f67b691856e4889 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 20 Oct 2020 14:27:06 +0200
Subject: [PATCH 01/21] Add warning

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index d9201e1..de1b9df 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,9 @@
 # Etherpad for YunoHost
 
+>[!WARNING]
+>This package installs Etherpad-Lite (without plugins) and uses PostgeSQL as a database.
+>If you want to install Etherpad with the MyPads plugin, use this [package](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
+
 [![Integration level](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)  
 [![Install Etherpad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=etherpad)
 

From 1a962973fbbe62d02f544196e2ee2b3e09105b90 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 20 Oct 2020 14:29:38 +0200
Subject: [PATCH 02/21] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index de1b9df..bd6ca19 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # Etherpad for YunoHost
 
->[!WARNING]
->This package installs Etherpad-Lite (without plugins) and uses PostgeSQL as a database.
+> :warning:This package installs Etherpad-Lite (without plugins) and uses PostgeSQL as a database.
 >If you want to install Etherpad with the MyPads plugin, use this [package](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
 
 [![Integration level](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)  

From 003ba36cee1cab7f0ef3f5a8fd4195a318c8a012 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 20 Oct 2020 14:32:50 +0200
Subject: [PATCH 03/21] Add warning

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

diff --git a/README.md b/README.md
index bd6ca19..2240925 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Etherpad for YunoHost
 
-> :warning:This package installs Etherpad-Lite (without plugins) and uses PostgeSQL as a database.
+> :warning: This package installs Etherpad-Lite (without MyPads and plugins). It uses PostgeSQL as a database.
 >If you want to install Etherpad with the MyPads plugin, use this [package](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
 
 [![Integration level](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)  
diff --git a/README_fr.md b/README_fr.md
index 5a65fac..e45a8b0 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,5 +1,8 @@
 # Etherpad pour YunoHost
 
+> :warning: Ce paquet installe Etherpad-Lite (sans MyPads et divers plugins). Il utilise PostgeSQL comme base de données.
+> Si vous souhaitez installer Etherpad avec MyPads, utilisez ce [paquet](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
+
 [![Niveau d'intégration](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)  
 [![Installer Etherpad avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=etherpad)
 

From f43e598d79441939f261114c91591e390e88b915 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 20 Oct 2020 14:46:46 +0200
Subject: [PATCH 04/21] Typo

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

diff --git a/README.md b/README.md
index 2240925..2b1f9dd 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Etherpad for YunoHost
 
-> :warning: This package installs Etherpad-Lite (without MyPads and plugins). It uses PostgeSQL as a database.
+> :warning: This package installs Etherpad-Lite (without MyPads and plugins). It uses PostgreSQL as a database.
 >If you want to install Etherpad with the MyPads plugin, use this [package](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
 
 [![Integration level](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)  
diff --git a/README_fr.md b/README_fr.md
index e45a8b0..f20ed32 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,6 +1,6 @@
 # Etherpad pour YunoHost
 
-> :warning: Ce paquet installe Etherpad-Lite (sans MyPads et divers plugins). Il utilise PostgeSQL comme base de données.
+> :warning: Ce paquet installe Etherpad-Lite (sans MyPads et divers plugins). Il utilise PostgreSQL comme base de données.
 > Si vous souhaitez installer Etherpad avec MyPads, utilisez ce [paquet](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)  

From d9eb99d2f5760a0df2910ed39b9f524eea9ceec7 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 20 Oct 2020 16:49:18 +0200
Subject: [PATCH 05/21] Update nginx.conf

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

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8a3d399..bff47bc 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -5,7 +5,7 @@ location __PATH__/ {
     rewrite ^ https://$server_name$request_uri? permanent;
   }
 
-  proxy_pass        http://127.0.0.1:__PORT__;
+  proxy_pass        http://127.0.0.1:__PORT__/;
   proxy_redirect    off;
   proxy_set_header  Host $host;
   proxy_set_header  X-Real-IP $remote_addr;

From a6477fa4be933a4fbabe90320da607e8a7c1ff93 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 20 Oct 2020 18:19:02 +0200
Subject: [PATCH 06/21] fix

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

diff --git a/conf/systemd.service b/conf/systemd.service
index 47d6b59..0ceab39 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -9,7 +9,7 @@ Group=__APP__
 WorkingDirectory=__FINALPATH__
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__FINALPATH__/node_modules/ep_etherpad-lite/node/server.js
+ExecStart=--experimental-worker __FINALPATH__/node_modules/ep_etherpad-lite/node/server.js
 Restart=always
 
 [Install]
diff --git a/scripts/install b/scripts/install
index 5795428..390b6c4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -183,7 +183,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" 
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/upgrade b/scripts/upgrade
index 12deddd..29b7724 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -166,7 +166,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --time --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" 
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120" 
 
 #=================================================
 # RELOAD NGINX

From 685b3aa6f3860fee7b539133730544cca999d40e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 20 Oct 2020 18:22:47 +0200
Subject: [PATCH 07/21] 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 0ceab39..47d6b59 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -9,7 +9,7 @@ Group=__APP__
 WorkingDirectory=__FINALPATH__
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=--experimental-worker __FINALPATH__/node_modules/ep_etherpad-lite/node/server.js
+ExecStart=__FINALPATH__/node_modules/ep_etherpad-lite/node/server.js
 Restart=always
 
 [Install]

From e0a3e65cce83725641acd1253cf5a81fd17c3d4d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 20 Oct 2020 18:26:21 +0200
Subject: [PATCH 08/21] Update systemd.service

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

diff --git a/conf/systemd.service b/conf/systemd.service
index 47d6b59..b4e603e 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -6,7 +6,6 @@ After=syslog.target network.target postgresql.service
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=__FINALPATH__
 Environment="NODE_ENV=production"
 Environment="__YNH_NODE_LOAD_PATH__"
 ExecStart=__FINALPATH__/node_modules/ep_etherpad-lite/node/server.js

From 11aa56108e2a3dd75607ce10d93c787ac6890b1f Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Oct 2020 13:25:59 +0200
Subject: [PATCH 09/21] fix

---
 conf/credentials.json | 2 +-
 scripts/change_url    | 1 +
 scripts/upgrade       | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/conf/credentials.json b/conf/credentials.json
index 609603b..94278b7 100644
--- a/conf/credentials.json
+++ b/conf/credentials.json
@@ -46,5 +46,5 @@
       "password": "__PASSWORD__",
       "is_admin": true
     }
-  }
+  },
 }
diff --git a/scripts/change_url b/scripts/change_url
index 42d9e9e..a791559 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+port=$(ynh_app_setting_get --app=$app --key=port)
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
diff --git a/scripts/upgrade b/scripts/upgrade
index 29b7724..b99001f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,6 +23,7 @@ is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 language=$(ynh_app_setting_get --app=$app --key=language)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+port=$(ynh_app_setting_get --app=$app --key=port)
 
 #=================================================
 # CHECK VERSION
@@ -102,7 +103,7 @@ ynh_add_nginx_config
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
 
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app
@@ -149,7 +150,7 @@ chmod 600 $final_path/credentials.json
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 
 # Create a dedicated systemd config
 ynh_add_systemd_config --others_var="ynh_node_load_PATH"
@@ -157,14 +158,14 @@ ynh_add_systemd_config --others_var="ynh_node_load_PATH"
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
 
 yunohost service add $app --description "Etherpad-lite, the collaborative editor." --log "/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=1
+ynh_script_progression --message="Starting a systemd service..." --time --weight=10
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120" 
 

From 571763f59a46e4dfb55e2bfbd053da5fc0dc79d3 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Oct 2020 13:31:34 +0200
Subject: [PATCH 10/21] Update upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index b99001f..5869cfc 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -165,7 +165,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=10
+ynh_script_progression --message="Starting a systemd service..." --weight=10
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120" 
 

From fb13f8d1a64a6b5b7c1369ed39e709a323c852e8 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Oct 2020 13:56:03 +0200
Subject: [PATCH 11/21] Update upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 5869cfc..6add9d0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,6 +23,8 @@ is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 language=$(ynh_app_setting_get --app=$app --key=language)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$db_name
+db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 port=$(ynh_app_setting_get --app=$app --key=port)
 
 #=================================================

From bfeea23059d9e4074c07d7b3a710bfeaf92a567a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Oct 2020 14:34:15 +0200
Subject: [PATCH 12/21] Update upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 6add9d0..37c381d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -26,6 +26,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
 port=$(ynh_app_setting_get --app=$app --key=port)
+password=$(ynh_app_setting_get --app=$app --key=password)
 
 #=================================================
 # CHECK VERSION

From fc20d01a2f432cf07d2161037367fc894cbaadc4 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Oct 2020 19:19:06 +0200
Subject: [PATCH 13/21] Fix

---
 scripts/change_url | 2 +-
 scripts/restore    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/change_url b/scripts/change_url
index a791559..5fc4a55 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -108,7 +108,7 @@ fi
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --time --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/restore b/scripts/restore
index ba54e67..93146f6 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -74,6 +74,15 @@ ynh_system_user_create --username=$app
 chown -R $app: $final_path
 chmod 600 $final_path/credentials.json
 
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=12
+
+ynh_install_app_dependencies $pkg_dependencies
+
+ynh_install_nodejs --nodejs_version=$nodejs_version
+
 #=================================================
 # RESTORE THE POSTQRESQL DATABASE
 #=================================================

From 4ec2047888ebb2a46752953f216fbe6cdc3fd58e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Oct 2020 19:27:31 +0200
Subject: [PATCH 14/21] fix

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

diff --git a/scripts/change_url b/scripts/change_url
index 5fc4a55..09eab2e 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -68,14 +68,14 @@ fi
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --time --weight=1
+ynh_script_progression --message="Stopping a systemd service..." --weight=3
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2
 
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
@@ -106,7 +106,7 @@ fi
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --time --weight=1
+ynh_script_progression --message="Starting a systemd service..." --weight=10
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 37c381d..a7eff5a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -31,6 +31,7 @@ password=$(ynh_app_setting_get --app=$app --key=password)
 #=================================================
 # CHECK VERSION
 #=================================================
+ynh_script_progression --message="Checking version..." --weight=1
 
 upgrade_type=$(ynh_check_app_version_changed)
 

From ab6a79fc8f0f68c2cf833b206df0d1e8e706a241 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Oct 2020 20:49:32 +0200
Subject: [PATCH 15/21] Update restore

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

diff --git a/scripts/restore b/scripts/restore
index 93146f6..c8750e7 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -112,7 +112,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=8
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120" 
 
 #=================================================
 # GENERIC FINALIZATION

From 44da7988aa98299fc60a70bb8d70374fe17a3c87 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Oct 2020 20:50:46 +0200
Subject: [PATCH 16/21] Action restart

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

diff --git a/scripts/change_url b/scripts/change_url
index 09eab2e..da2e276 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -108,7 +108,7 @@ fi
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=10
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120"
+ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/install b/scripts/install
index 390b6c4..ab71b5c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -183,7 +183,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120"
+ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/restore b/scripts/restore
index c8750e7..31ede3c 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -112,7 +112,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=8
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120" 
+ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index a7eff5a..e5abd6f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -171,7 +171,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=10
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" --line_match="Your Etherpad version is" --timeout="120" 
+ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" 
 
 #=================================================
 # RELOAD NGINX

From d35972f178cdda7e9adf9d6ca24f5f124ace74cc Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 23 Oct 2020 11:07:33 +0200
Subject: [PATCH 17/21] Set to systemd logs

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

diff --git a/scripts/change_url b/scripts/change_url
index da2e276..2476775 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -108,7 +108,7 @@ fi
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=10
 
-ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
+ynh_systemd_action --action=restart --log_path="systemd" --line_match="You can access your Etherpad instance at"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/install b/scripts/install
index ab71b5c..58cd633 100644
--- a/scripts/install
+++ b/scripts/install
@@ -183,7 +183,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
+ynh_systemd_action --action=restart --log_path="systemd" --line_match="You can access your Etherpad instance at"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/restore b/scripts/restore
index 31ede3c..38edfea 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -112,7 +112,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=8
 
-ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120"
+ynh_systemd_action --action=restart --log_path="systemd" --line_match="You can access your Etherpad instance at"
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index e5abd6f..b91ed24 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -171,7 +171,7 @@ yunohost service add $app --description "Etherpad-lite, the collaborative editor
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=10
 
-ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" 
+ynh_systemd_action --action=restart --log_path="systemd" --line_match="You can access your Etherpad instance at"
 
 #=================================================
 # RELOAD NGINX

From d94488099fba7b8c75425a35694c345ba3818614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 23 Oct 2020 21:44:27 +0200
Subject: [PATCH 18/21] Update README.md

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

diff --git a/README.md b/README.md
index 2b1f9dd..eb1a126 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Etherpad for YunoHost
 
 > :warning: This package installs Etherpad-Lite (without MyPads and plugins). It uses PostgreSQL as a database.
->If you want to install Etherpad with the MyPads plugin, use this [package](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
+>If you want to install Etherpad with the MyPads plugin, use the [Etherpad MyPads package](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
 
 [![Integration level](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)  
 [![Install Etherpad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=etherpad)

From 534fe11f6f36bf7e71d0b4ed1877b52f8577f171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 23 Oct 2020 21:45:09 +0200
Subject: [PATCH 19/21] Update README_fr.md

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

diff --git a/README_fr.md b/README_fr.md
index f20ed32..cf15b82 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,7 +1,7 @@
 # Etherpad pour YunoHost
 
 > :warning: Ce paquet installe Etherpad-Lite (sans MyPads et divers plugins). Il utilise PostgreSQL comme base de données.
-> Si vous souhaitez installer Etherpad avec MyPads, utilisez ce [paquet](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
+> Si vous souhaitez installer Etherpad avec MyPads, utilisez le paquet [Etherpad MyPads](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)  
 [![Installer Etherpad avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=etherpad)

From 8a0b7664c94118a21e1998a6016d10655a0dba11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 27 Oct 2020 14:11:42 +0100
Subject: [PATCH 20/21] Update README_fr.md

---
 README_fr.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README_fr.md b/README_fr.md
index cf15b82..dbb4cff 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,4 +1,4 @@
-# Etherpad pour YunoHost
+# Etherpad-Lite pour YunoHost
 
 > :warning: Ce paquet installe Etherpad-Lite (sans MyPads et divers plugins). Il utilise PostgreSQL comme base de données.
 > Si vous souhaitez installer Etherpad avec MyPads, utilisez le paquet [Etherpad MyPads](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
@@ -26,9 +26,9 @@ Etherpad vous permet d'éditer des documents de manière collaborative en temps
 
 ## Configuration
 
-Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `domain.tld/admin` et pour MyPads par `domain.tld/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `/var/www/etherpad/settings.json`.
+Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `domain.tld/admin`. Le fichier de configuration d'Etherpad est `/var/www/etherpad/settings.json`.
 
-*Skin Builder* (accessible à cette adresse `domain.tld/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `/var/www/etherpad/settings.json`.
+*Skin Builder* (accessible à l'adresse `domain.tld/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `/var/www/etherpad/settings.json`.
 
 ## Documentation
 

From d4c28e627d4768748bebefd9ce7d269b9c756ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 27 Oct 2020 14:14:43 +0100
Subject: [PATCH 21/21] Update README.md

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index eb1a126..656b783 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Etherpad for YunoHost
+# Etherpad-Lite for YunoHost
 
 > :warning: This package installs Etherpad-Lite (without MyPads and plugins). It uses PostgreSQL as a database.
 >If you want to install Etherpad with the MyPads plugin, use the [Etherpad MyPads package](https://github.com/YunoHost-Apps/etherpad_mypads_ynh).
@@ -26,8 +26,7 @@ Etherpad allows you to edit documents collaboratively in real-time, much like a
 
 ## Configuration
 
-You can access two different admin panels, for Etherpad by accessing `domain.tld/admin`. 
-You can also find a configuration file for Etherpad at this path `/var/www/etherpad/settings.json`.
+You can access Etherpad's admin panel at `domain.tld/admin`. The configuration file for Etherpad is at the path `/var/www/etherpad/settings.json`.
 
 *Skin Builder* (accessible at this address `domain.tld/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `/var/www/etherpad/settings.json`.