From b8afb924c32af246fdac20919b32f88c01df288c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ebbe=20Ba=C3=9F?= Date: Thu, 16 Jul 2026 14:49:25 +0200 Subject: [PATCH] changed apache2 config --- .../deploy_collabora_code.yml | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/deploy_collabora_code.yml b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/deploy_collabora_code.yml index 7905a4e..18cd15c 100644 --- a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/deploy_collabora_code.yml +++ b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/deploy_collabora_code.yml @@ -164,33 +164,44 @@ # Encoded slashes need to be allowed AllowEncodedSlashes NoDecode - # keep the host ProxyPreserveHost On + + # cert is issued for collaboraonline.example.com and we proxy to localhost + SSLProxyVerify None + SSLProxyCheckPeerCN Off + SSLProxyCheckPeerName Off + + # static html, js, images, etc. served from coolwsd - # loleaflet/browser is the client part of Collabora Online - ProxyPass /loleaflet http://127.0.0.1:9980/loleaflet retry=0 - ProxyPassReverse /loleaflet http://127.0.0.1:9980/loleaflet - ProxyPass /browser http://127.0.0.1:9980/browser retry=0 - ProxyPassReverse /browser http://127.0.0.1:9980/browser + # browser is the client part of Collabora Online + ProxyPass /browser https://127.0.0.1:9980/browser retry=0 + ProxyPassReverse /browser https://127.0.0.1:9980/browser + # WOPI discovery URL - ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0 - ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery + ProxyPass /hosting/discovery https://127.0.0.1:9980/hosting/discovery retry=0 + ProxyPassReverse /hosting/discovery https://127.0.0.1:9980/hosting/discovery + # Capabilities - ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0 - ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities + ProxyPass /hosting/capabilities https://127.0.0.1:9980/hosting/capabilities retry=0 + ProxyPassReverse /hosting/capabilities https://127.0.0.1:9980/hosting/capabilities + + # Main websocket (legacy URL, with the document path encoded into it) + ProxyPassMatch "/cool/(.*)/ws$" wss://127.0.0.1:9980/cool/$1/ws nocanon + + # Main websocket (compact URL, used since 26.04, with the document passed via the WOPISrc query parameter) + ProxyPass /cool/ws wss://127.0.0.1:9980/cool/ws nocanon - # Main websocket - ProxyPassMatch "/cool/(.*)/ws$" ws://127.0.0.1:9980/cool/$1/ws nocanon # Admin Console websocket - ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws + ProxyPass /cool/adminws wss://127.0.0.1:9980/cool/adminws - # Download as, Fullscreen presentation and Image upload operations - ProxyPass /cool http://127.0.0.1:9980/cool - ProxyPassReverse /cool http://127.0.0.1:9980/cool + + # Download as, presentation (legacy svg) and image upload operations + ProxyPass /cool https://127.0.0.1:9980/cool + ProxyPassReverse /cool https://127.0.0.1:9980/cool SSLEngine on SSLCertificateFile {{ cc_ssl_cert }}