From 3aab11ab354cd00b91148c34396e32516463a1c6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 20 Jun 2022 07:08:42 +0200 Subject: [PATCH 1/6] Update check_process --- check_process | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index 63559a2..88304b5 100644 --- a/check_process +++ b/check_process @@ -33,7 +33,7 @@ setup_public=1 upgrade=1 # 1.8.17~ynh1 - upgrade=1 from_commit=44f73d6d49c4ece92648f0374cf02ec4e9e3fb5f + upgrade=1 from_commit=4d613658f120a05537f11f6814cc28e09d74a3c8 backup_restore=1 multi_instance=1 port_already_use=0 @@ -69,7 +69,7 @@ useldap=0 ; Checks setup_root=1 - upgrade=1 from_commit=b7815983353a5409d473618f21107b4c621b9858 + upgrade=1 from_commit=4d613658f120a05537f11f6814cc28e09d74a3c8 ;; Test sans export ; Manifest domain="domain.tld" @@ -87,6 +87,6 @@ Email= Notification=change ;;; Upgrade options - ; commit=b7815983353a5409d473618f21107b4c621b9858 - name= #159 + ; commit=4d613658f120a05537f11f6814cc28e09d74a3c8 + name= #166 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=password&language=en&is_public=1&abiword=0& From ca9eb7c7d2a2bfd5d00e93143c0ae210ef87bfee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Jun 2022 23:49:06 +0200 Subject: [PATCH 2/6] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 9a09575..50e96ec 100644 --- a/scripts/install +++ b/scripts/install @@ -270,7 +270,7 @@ fi ynh_script_progression --message="Configuring log rotation..." # Use logrotate to manage application logfile(s) -ynh_use_logrotate +ynh_use_logrotate --specific_user=$app/$app #================================================= # INTEGRATE SERVICE IN YUNOHOST From 86d1dade95eff98ed36ad4907e8d97a6039065df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 24 Jun 2022 13:53:56 +0200 Subject: [PATCH 3/6] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 50e96ec..4871e08 100644 --- a/scripts/install +++ b/scripts/install @@ -270,7 +270,7 @@ fi ynh_script_progression --message="Configuring log rotation..." # Use logrotate to manage application logfile(s) -ynh_use_logrotate --specific_user=$app/$app +ynh_use_logrotate --non-append --specific_user=$app/$app #================================================= # INTEGRATE SERVICE IN YUNOHOST From 9c597c43d8fd0a196a818ed117b3d64cd3452ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 24 Jun 2022 14:19:58 +0200 Subject: [PATCH 4/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d7a67c1..1183698 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online editor providing collaborative editing in real-time", "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel" }, - "version": "1.8.17~ynh2", + "version": "1.8.17~ynh3", "url": "http://etherpad.org", "upstream": { "license": "Apache-2.0", From cd360c23f62c82dabf723a5f1867cf9ec92875ba Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 24 Jun 2022 12:20:05 +0000 Subject: [PATCH 5/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6e5d22c..5c43669 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Etherpad is a real-time collaborative editor scalable to thousands of simultaneo - Scale - Etherpad running at scale with pad sharding which allows Etherpad to scale to ∞ number of Active Pads with up to 20,000 edits per second, per pad. -**Shipped version:** 1.8.17~ynh2 +**Shipped version:** 1.8.17~ynh3 **Demo:** https://video.etherpad.com diff --git a/README_fr.md b/README_fr.md index 2d19ede..42f475e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle. -**Version incluse :** 1.8.17~ynh2 +**Version incluse :** 1.8.17~ynh3 **Démo :** https://video.etherpad.com From 82453bd6f72e8d78803017e42326d23718738ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 25 Jun 2022 10:09:31 +0200 Subject: [PATCH 6/6] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 4871e08..fbce447 100644 --- a/scripts/install +++ b/scripts/install @@ -267,7 +267,7 @@ fi #================================================= # SETUP LOGROTATE #================================================= -ynh_script_progression --message="Configuring log rotation..." +ynh_script_progression --message="Configuring log rotation..." --weight=1 # Use logrotate to manage application logfile(s) ynh_use_logrotate --non-append --specific_user=$app/$app @@ -275,7 +275,7 @@ ynh_use_logrotate --non-append --specific_user=$app/$app #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." +ynh_script_progression --message="Integrating service in YunoHost..." --weight=2 yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/etherpad.log" @@ -323,7 +323,7 @@ ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin --aut #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload