mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-08-30 07:18:09 +02:00
Different optimations for collabora
This commit is contained in:
20
roles/web-svc-collabora/tasks/01_core.yml
Normal file
20
roles/web-svc-collabora/tasks/01_core.yml
Normal file
@@ -0,0 +1,20 @@
|
||||
- name: Update Collabora systemplate to include new fonts
|
||||
command: "{{ COLLABORA_DOCKER_CONF_EXEC }} update-system-template"
|
||||
register: collabora_fonts
|
||||
changed_when: >
|
||||
(not ASYNC_ENABLED | bool )
|
||||
and
|
||||
('updated' in (collabora_fonts.stdout | default('')))
|
||||
async: "{{ ASYNC_TIME if (ASYNC_ENABLED | default(false) | bool) else omit }}"
|
||||
poll: "{{ ASYNC_POLL if (ASYNC_ENABLED | default(false) | bool) else omit }}"
|
||||
when: MODE_UPDATE | bool
|
||||
|
||||
- name: Allow Nextcloud host IP for Collabora preview conversion
|
||||
command: "{{ COLLABORA_DOCKER_CONF_EXEC }} set net.post_allow.host {{ networks.internet.ip4 }}"
|
||||
register: collabora_preview
|
||||
changed_when: >
|
||||
(not ASYNC_ENABLED | bool )
|
||||
and
|
||||
('already present' not in (collabora_preview.stdout | default('')))
|
||||
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
||||
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
@@ -2,5 +2,9 @@
|
||||
- name: "load docker, proxy for '{{ application_id }}'"
|
||||
include_role:
|
||||
name: cmp-docker-proxy
|
||||
vars:
|
||||
docker_compose_flush_handlers: true
|
||||
- name: "Load core functions for '{{ application_id }}'"
|
||||
include_tasks: 01_core.yml
|
||||
- include_tasks: utils/run_once.yml
|
||||
when: run_once_web_svc_collabora is not defined
|
@@ -1,4 +1,2 @@
|
||||
domain={{ (domains | get_domain('web-app-nextcloud')) | regex_replace('\\.', '\\\\.') }}
|
||||
{# username=admin #}
|
||||
{# password={{ applications | get_app_conf('web-svc-collabora', 'credentials.admin_password', False, 'ChangeMe!') }}" #}
|
||||
extra_params=--o:ssl.enable=false --o:ssl.termination=true
|
||||
domain={{ COLLABORA_ALLOWED_DOMAINS }}
|
||||
extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:net.service_root=/ --o:net.wopi_allowed_hosts={{ COLLABORA_ALLOWED_HOSTS }}
|
@@ -6,6 +6,9 @@ container_port: 9980
|
||||
container_healthcheck: "/hosting/discovery"
|
||||
|
||||
# Collabora
|
||||
COLLABORA_CONTAINER: "{{ applications | get_app_conf(application_id, 'docker.services.collabora.name') }}"
|
||||
COLLABORA_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.collabora.image') }}"
|
||||
COLLABORA_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.collabora.version') }}"
|
||||
COLLABORA_CONTAINER: "{{ applications | get_app_conf(application_id, 'docker.services.collabora.name') }}"
|
||||
COLLABORA_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.collabora.image') }}"
|
||||
COLLABORA_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.collabora.version') }}"
|
||||
COLLABORA_DOCKER_CONF_EXEC: "docker exec {{ COLLABORA_CONTAINER }} coolconfig"
|
||||
COLLABORA_ALLOWED_DOMAINS: "(.*\\.|){{ PRIMARY_DOMAIN | regex_replace('\\.', '\\\\.') }}"
|
||||
COLLABORA_ALLOWED_HOSTS: "{{ domains | get_domain('web-app-nextcloud') }}"
|
Reference in New Issue
Block a user