Fixes Collabora

This commit is contained in:
Jan Beilicke 2023-10-29 23:03:39 +01:00
parent af01d986d1
commit e80820b308
3 changed files with 3 additions and 1 deletions

View file

@ -50,7 +50,7 @@
- assert: - assert:
that: 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" - name: "Test whether Collabora is healthy from the public internet"
become: false become: false

View file

@ -7,6 +7,7 @@ services:
environment: environment:
- extra_params - extra_params
- domain - domain
- aliasgroup1
{% if collabora_admin_user is defined and collabora_admin_password is defined %} {% if collabora_admin_user is defined and collabora_admin_password is defined %}
- username - username
- password - password

View file

@ -1,5 +1,6 @@
extra_params=--o:ssl.enable=false --o:ssl.termination=true extra_params=--o:ssl.enable=false --o:ssl.termination=true
domain={{collabora_domain_regex_pattern|replace('\\', '\\\\')}} domain={{collabora_domain_regex_pattern|replace('\\', '\\\\')}}
aliasgroup1={{ collabora_virtual_host }}
{% if collabora_admin_user is defined and collabora_admin_password is defined %} {% if collabora_admin_user is defined and collabora_admin_password is defined %}
username={{ collabora_admin_user }} username={{ collabora_admin_user }}
password={{ collabora_admin_password }} password={{ collabora_admin_password }}