Commit 911b8095 authored by Chris Croome's avatar Chris Croome

fixes

parent 91a06d16
Pipeline #6333 failed with stage
in 21 seconds
......@@ -8,7 +8,7 @@
# collabora has already been installed
distro: stretch
# Let's Encrypt certificate commonName
# common_name: "collabora.{{ hostname }}"
common_name: "{{ hostname }}"
# These nameservers will need changing for installing somewhere other than on Webarchitects servers
nameserver_1: 81.95.52.30
nameserver_2: 81.95.52.27
......
......@@ -117,21 +117,25 @@
- block:
- name: Include acmesh role if Collabora is enabled
include_role:
name: acmesh
vars:
common_name: "collabora.{{ hostname }}"
- block:
- name: Include Docker role if Collabora is enabled
include_role:
name: docker
- name: Include acmesh role if Collabora is enabled
include_role:
name: acmesh
vars:
common_name: "collabora.{{ hostname }}"
- name: Include Collabora role if Collabora is enabled
include_role:
name: collabora
- name: Include Docker role if Collabora is enabled
include_role:
name: docker
when: ( apache_collabora_conf_enabled is defined ) and ( apache_collabora_conf_enabled.stat.islnk == True )
- name: Include Collabora role if Collabora is enabled
include_role:
name: collabora
when: apache_collabora_conf_enabled.stat.exists == True
when: apache_collabora_conf_enabled is defined
- name: Turn maintenance mode off
shell: php occ maintenance:mode --off
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment