From d79c3798c905b6f80475f477252f81675d4351cf Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 6 Aug 2021 10:09:07 +0200 Subject: [PATCH 1/7] fix --- scripts/install | 2 ++ scripts/restore | 1 + scripts/upgrade | 2 ++ 3 files changed, 5 insertions(+) diff --git a/scripts/install b/scripts/install index c10b7be..268a041 100644 --- a/scripts/install +++ b/scripts/install @@ -67,6 +67,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= # CONFIGURE ONLYOFFICE #================================================= +ynh_script_progression --message="Installing config file..." --weight=2 # Turns out we need to create/copy this file BEFORE the actual .deb install, # otherwise stupid collabora will expect to find a certificate file in its own @@ -74,6 +75,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port # because we're in a reverse proxy context... mkdir -p /etc/loolwsd ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml" +chown lool: "/etc/loolwsd/loolwsd.xml" #================================================= # INSTALL DEPENDENCIES diff --git a/scripts/restore b/scripts/restore index aee7195..3f17ffa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -52,6 +52,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Restoring the configuration..." --weight=3 ynh_restore_file --origin_path="/etc/loolwsd/loolwsd.xml" +chown lool: "/etc/loolwsd/loolwsd.xml" #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index cf43bf1..01232fd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -74,8 +74,10 @@ ynh_add_nginx_config #================================================= # UPGRADE CONFIG #================================================= +ynh_script_progression --message="Upgrading config file..." --weight=2 ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml" +chown lool: "/etc/loolwsd/loolwsd.xml" #================================================= # UPGRADE DEPENDENCIES From 4081752f39f8f94115afc1fb77f65c5014aa159b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 6 Aug 2021 11:47:30 +0200 Subject: [PATCH 2/7] Fix --- scripts/install | 1 + scripts/restore | 2 ++ scripts/upgrade | 2 ++ 3 files changed, 5 insertions(+) diff --git a/scripts/install b/scripts/install index 268a041..716c815 100644 --- a/scripts/install +++ b/scripts/install @@ -76,6 +76,7 @@ ynh_script_progression --message="Installing config file..." --weight=2 mkdir -p /etc/loolwsd ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml" chown lool: "/etc/loolwsd/loolwsd.xml" +chmod 640 "/etc/loolwsd/loolwsd.xml" #================================================= # INSTALL DEPENDENCIES diff --git a/scripts/restore b/scripts/restore index 3f17ffa..c5b61ea 100644 --- a/scripts/restore +++ b/scripts/restore @@ -52,7 +52,9 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Restoring the configuration..." --weight=3 ynh_restore_file --origin_path="/etc/loolwsd/loolwsd.xml" + chown lool: "/etc/loolwsd/loolwsd.xml" +chmod 640 "/etc/loolwsd/loolwsd.xml" #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 01232fd..4dd15fd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,7 +77,9 @@ ynh_add_nginx_config ynh_script_progression --message="Upgrading config file..." --weight=2 ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml" + chown lool: "/etc/loolwsd/loolwsd.xml" +chmod 640 "/etc/loolwsd/loolwsd.xml" #================================================= # UPGRADE DEPENDENCIES From 10549ce6a4ba704426c82ac2ebf3ae506c60537d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 6 Aug 2021 11:49:08 +0200 Subject: [PATCH 3/7] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 55387ca..f0c8a51 100644 --- a/check_process +++ b/check_process @@ -1,7 +1,7 @@ ;; Test complet ; Manifest domain="domain.tld" - password="pass" + password="password" nextcloud_domain="nextcloud.tld" ; Checks pkg_linter=1 From 2dd44f1312aa024b36005657d4c1475c9a5e91a5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 6 Aug 2021 11:51:11 +0200 Subject: [PATCH 4/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 6333873..c2b7925 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "LibreOffice-based online office suite with collaborative editing", "fr": "Suite office en ligne et collaborative, basée sur LibreOffice" }, - "version": "6.4.10~ynh1", + "version": "6.4.10~ynh2", "url": "https://collaboraoffice.com", "upstream": { "license": "MPL-2.0", From ef867d08d27eb2116fd980acbd32f8316b4d5887 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 6 Aug 2021 09:51:16 +0000 Subject: [PATCH 5/7] 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 b724e85..d262f93 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in LibreOffice-based online office suite with collaborative editing -**Shipped version:** 6.4.10~ynh1 +**Shipped version:** 6.4.10~ynh2 diff --git a/README_fr.md b/README_fr.md index d9b9bf6..34518ba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Suite office en ligne et collaborative, basée sur LibreOffice -**Version incluse :** 6.4.10~ynh1 +**Version incluse :** 6.4.10~ynh2 From b758afbe67ad80963ae67ca8462954f160509fbe Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 6 Aug 2021 13:24:17 +0200 Subject: [PATCH 6/7] Fix --- scripts/install | 1 - scripts/restore | 2 -- 2 files changed, 3 deletions(-) diff --git a/scripts/install b/scripts/install index 716c815..8696134 100644 --- a/scripts/install +++ b/scripts/install @@ -75,7 +75,6 @@ ynh_script_progression --message="Installing config file..." --weight=2 # because we're in a reverse proxy context... mkdir -p /etc/loolwsd ynh_add_config --template="../conf/loolwsd.xml" --destination="/etc/loolwsd/loolwsd.xml" -chown lool: "/etc/loolwsd/loolwsd.xml" chmod 640 "/etc/loolwsd/loolwsd.xml" #================================================= diff --git a/scripts/restore b/scripts/restore index c5b61ea..fd29bf1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -52,8 +52,6 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Restoring the configuration..." --weight=3 ynh_restore_file --origin_path="/etc/loolwsd/loolwsd.xml" - -chown lool: "/etc/loolwsd/loolwsd.xml" chmod 640 "/etc/loolwsd/loolwsd.xml" #================================================= From 2792a5c6fe320c27b6f1f976017ebbdf37d0b5cb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 6 Aug 2021 13:58:29 +0200 Subject: [PATCH 7/7] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index fd29bf1..032367f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -74,7 +74,7 @@ yunohost service add "loolwsd" --description="Collabora online office suite" --l #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." +ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name="loolwsd" --action="restart" --log_path="systemd" --line_match="Ready to accept connections"