From 76ed41ad5db9fb89742f7dc8ed1f3d49ebab0e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 5 Apr 2023 09:23:05 +0200 Subject: [PATCH 1/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f10d140..3985897 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": "22.05.8.2~ynh2", + "version": "22.05.12.2~ynh1", "url": "https://collaboraoffice.com", "upstream": { "license": "MPL-2.0", From 05d2a3ab67e7dc11da8dcdd78232bc21f48be0ce Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 5 Apr 2023 07:23:10 +0000 Subject: [PATCH 2/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 868c4c0..4b640c0 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Collabora Online is a powerful LibreOffice-based online office that supports all - presentations (odp, pptx, ppt…) -**Shipped version:** 22.05.8.2~ynh2 +**Shipped version:** 22.05.12.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 12046f9..c02756c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Collabora Online est une suite bureautique en ligne open source basé sur LibreO - des tableurs (ods, xlsx, xls…) - présentations (odp, pptx, ppt…) -**Version incluse :** 22.05.8.2~ynh2 +**Version incluse :** 22.05.12.2~ynh1 ## Captures d’écran From 70788e0e2a0b0a15a30660f40a3dc633d876a086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 5 Apr 2023 11:08:14 +0200 Subject: [PATCH 3/6] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index f0c8a51..6cad445 100644 --- a/check_process +++ b/check_process @@ -1,7 +1,7 @@ ;; Test complet ; Manifest domain="domain.tld" - password="password" + password="1Strong-Password" nextcloud_domain="nextcloud.tld" ; Checks pkg_linter=1 From 56d90fb35346f59adfe161b78c4426c2bc2ea7c1 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 5 Jul 2023 00:23:48 +0200 Subject: [PATCH 4/6] [autopatch] Fix Host and X-Forwarded-For header spoofing --- conf/nginx.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6acb77a..436d7e5 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,21 +7,21 @@ location ~ ^/$ { # static files location ^~ /browser { proxy_pass http://localhost:__PORT__; - proxy_set_header Host $http_host; + proxy_set_header Host $host; more_set_headers "X-Frame-Options: ALLOWALL"; } # WOPI discovery URL location ^~ /hosting/discovery { proxy_pass http://localhost:__PORT__; - proxy_set_header Host $http_host; + proxy_set_header Host $host; more_set_headers "X-Frame-Options: ALLOWALL"; } # Capabilities location ^~ /hosting/capabilities { proxy_pass http://localhost:__PORT__; - proxy_set_header Host $http_host; + proxy_set_header Host $host; more_set_headers "X-Frame-Options: ALLOWALL"; } @@ -30,7 +30,7 @@ location ~ ^/cool/(.*)/ws$ { proxy_pass http://localhost:__PORT__; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_read_timeout 36000s; more_set_headers "X-Frame-Options: ALLOWALL"; } @@ -38,7 +38,7 @@ location ~ ^/cool/(.*)/ws$ { # download, presentation and image upload location ~ ^/(c|l)ool { proxy_pass http://localhost:__PORT__; - proxy_set_header Host $http_host; + proxy_set_header Host $host; more_set_headers "X-Frame-Options: ALLOWALL"; } @@ -47,6 +47,6 @@ location ^~ /cool/adminws { proxy_pass http://localhost:__PORT__; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_read_timeout 36000s; } From b7fbe238a64bde2479b638dff9823085a34d37a8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 30 Jul 2023 10:18:11 +0100 Subject: [PATCH 5/6] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 3985897..153e1f7 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": "22.05.12.2~ynh1", + "version": "22.05.14.3~ynh1", "url": "https://collaboraoffice.com", "upstream": { "license": "MPL-2.0", @@ -19,7 +19,7 @@ "email": "rafi59_dev@srvmaison.fr.nf" }, "requirements": { - "yunohost": ">= 11.1.15" + "yunohost": ">= 11.2" }, "multi_instance": false, "services": [ From d36e8df50fa0ea7ae6bcb0cefb33563590f27832 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 30 Jul 2023 09:18:16 +0000 Subject: [PATCH 6/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 4b640c0..24363d2 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Collabora Online is a powerful LibreOffice-based online office that supports all - presentations (odp, pptx, ppt…) -**Shipped version:** 22.05.12.2~ynh1 +**Shipped version:** 22.05.14.3~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c02756c..ffaf364 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Collabora Online est une suite bureautique en ligne open source basé sur LibreO - des tableurs (ods, xlsx, xls…) - présentations (odp, pptx, ppt…) -**Version incluse :** 22.05.12.2~ynh1 +**Version incluse :** 22.05.14.3~ynh1 ## Captures d’écran