From e80820b308fde1d63b184a91c14421efe0d4f025 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Sun, 29 Oct 2023 23:03:39 +0100 Subject: [PATCH] Fixes Collabora --- tasks/main.yml | 2 +- templates/docker-compose.collabora-online.yml.j2 | 1 + templates/env.collabora-online.j2 | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 4990153..2b5fe7a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -50,7 +50,7 @@ - assert: that: - - "output.ansible_facts['collabora']['collabora-online_collabora_1'].state.running" + - output['services']['collabora']['collabora-online_collabora_1'].state.running - name: "Test whether Collabora is healthy from the public internet" become: false diff --git a/templates/docker-compose.collabora-online.yml.j2 b/templates/docker-compose.collabora-online.yml.j2 index f63b7c0..8e2bfc4 100644 --- a/templates/docker-compose.collabora-online.yml.j2 +++ b/templates/docker-compose.collabora-online.yml.j2 @@ -7,6 +7,7 @@ services: environment: - extra_params - domain + - aliasgroup1 {% if collabora_admin_user is defined and collabora_admin_password is defined %} - username - password diff --git a/templates/env.collabora-online.j2 b/templates/env.collabora-online.j2 index 8c4446d..07a4bc3 100644 --- a/templates/env.collabora-online.j2 +++ b/templates/env.collabora-online.j2 @@ -1,5 +1,6 @@ extra_params=--o:ssl.enable=false --o:ssl.termination=true domain={{collabora_domain_regex_pattern|replace('\\', '\\\\')}} +aliasgroup1={{ collabora_virtual_host }} {% if collabora_admin_user is defined and collabora_admin_password is defined %} username={{ collabora_admin_user }} password={{ collabora_admin_password }}