From f3b831d119de667618704cb283e9789973419924 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 2 Nov 2020 19:02:57 +0100 Subject: [PATCH 1/6] 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 eedc1a9fb25852911e05b8aeebd3715a0a2d8a71 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 2 Nov 2020 19:04:26 +0100 Subject: [PATCH 2/6] 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 47d6b59..c73a61e 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=__FINALPATH__/node_modules/ep_etherpad-lite/node/server.js /var/log/__APP__/etherpad.log Restart=always [Install] From 611585d5ba8f86ade3485bee8a7b852aa02f695d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 2 Nov 2020 19:11:47 +0100 Subject: [PATCH 3/6] 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 c73a61e..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=__FINALPATH__/node_modules/ep_etherpad-lite/node/server.js /var/log/__APP__/etherpad.log +ExecStart=__FINALPATH__/node_modules/ep_etherpad-lite/node/server.js Restart=always [Install] diff --git a/scripts/install b/scripts/install index 5795428..ced2f2d 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="systemd" --line_match="Your Etherpad version is" #================================================= # SETUP SSOWAT From 5e3230a1a615ca6ef63b299aa944eb1ed051f988 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 2 Nov 2020 19:18:36 +0100 Subject: [PATCH 4/6] Fix log --- scripts/change_url | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 42d9e9e..7e8b161 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -107,7 +107,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="systemd" --line_match="Your Etherpad version is" #================================================= # RELOAD NGINX diff --git a/scripts/restore b/scripts/restore index ba54e67..dba7bd3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -103,7 +103,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="systemd" --line_match="Your Etherpad version is" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 12deddd..d242040 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="systemd" --line_match="Your Etherpad version is" #================================================= # RELOAD NGINX From 1686c96eef63769214491b5cb9e58f59448e014a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 2 Nov 2020 19:20:10 +0100 Subject: [PATCH 5/6] Update README.md --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d9201e1..656b783 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -# 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). [![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) @@ -23,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`. From 86ad0f2ef6de42d1eb7bf4ce41b9a19139835bb9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 2 Nov 2020 19:20:55 +0100 Subject: [PATCH 6/6] Update README_fr.md --- README_fr.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README_fr.md b/README_fr.md index 5a65fac..dbb4cff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,4 +1,7 @@ -# 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). [![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) @@ -23,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