diff --git a/tasks/main.yml b/tasks/main.yml index e3c1664..88d5afa 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -50,7 +50,7 @@ - assert: that: - - output['services']['collabora']['collabora-online_collabora_1'].state.running + - "output.ansible_facts['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 4d15b41..9053903 100644 --- a/templates/docker-compose.collabora-online.yml.j2 +++ b/templates/docker-compose.collabora-online.yml.j2 @@ -9,7 +9,6 @@ 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 07a4bc3..8c4446d 100644 --- a/templates/env.collabora-online.j2 +++ b/templates/env.collabora-online.j2 @@ -1,6 +1,5 @@ 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 }}