From ef2462a26a477e4ab967423857de8c30aae27a04 Mon Sep 17 00:00:00 2001 From: Bert-Jan Fikse Date: Fri, 6 Mar 2026 17:00:33 +0100 Subject: [PATCH] chore: ensure we can use the same collabora instance for multiple cloud instances Signed-off-by: Bert-Jan Fikse --- inventories/vagrant/host_vars/backend/collabora.yml | 11 ++++++++++- inventories/vagrant/host_vars/backend/opencloud.yml | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/inventories/vagrant/host_vars/backend/collabora.yml b/inventories/vagrant/host_vars/backend/collabora.yml index 29bae6e..88caab8 100644 --- a/inventories/vagrant/host_vars/backend/collabora.yml +++ b/inventories/vagrant/host_vars/backend/collabora.yml @@ -1,6 +1,15 @@ collabora_domain: "office.local.test" +collabora_ssl_verification: false # Allowed WOPI host domains collabora_allowed_domains: - "nextcloud.local.test" - - "opencloud.local.test" \ No newline at end of file + - "wopi.opencloud.local.test" + +# Domains allowed to embed Collabora in an iframe +collabora_frame_ancestors: + - "nextcloud.local.test" + - "opencloud.local.test" + +collabora_extra_hosts: + - "wopi.opencloud.local.test:host-gateway" \ No newline at end of file diff --git a/inventories/vagrant/host_vars/backend/opencloud.yml b/inventories/vagrant/host_vars/backend/opencloud.yml index 627e601..5656f4d 100644 --- a/inventories/vagrant/host_vars/backend/opencloud.yml +++ b/inventories/vagrant/host_vars/backend/opencloud.yml @@ -4,6 +4,7 @@ opencloud_extra_hosts: - "opencloud.local.test:host-gateway" - "keycloak.local.test:host-gateway" - "storage.local.test:192.168.56.11" + - "office.local.test:host-gateway" # OIDC configuration (Keycloak) opencloud_oidc_issuer: "https://keycloak.local.test/realms/vagrant" @@ -18,6 +19,10 @@ opencloud_s3_access_key: "{{ lookup('digitalboard.core.garage_credentials', 'ope opencloud_s3_secret_key: "{{ lookup('digitalboard.core.garage_credentials', 'opencloud', host='backend')['secret_key'] }}" opencloud_s3_bucket: "opencloud" +# Collabora integration +opencloud_collabora_domain: "office.local.test" +opencloud_wopi_domain: "wopi.opencloud.local.test" + # Allow OpenCloud to connect to Keycloak for OIDC discovery opencloud_csp_extra_connect_src: - "https://keycloak.local.test/" \ No newline at end of file