mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-08-29 15:06:26 +02:00
Different optimations for collabora
This commit is contained in:
@@ -10,6 +10,7 @@ server:
|
||||
font-src:
|
||||
- "data:"
|
||||
connect-src:
|
||||
- "wss://collabora.{{ PRIMARY_DOMAIN }}"
|
||||
- "{{ WEB_PROTOCOL }}://collabora.{{ PRIMARY_DOMAIN }}"
|
||||
frame-src:
|
||||
- "{{ WEB_PROTOCOL }}://collabora.{{ PRIMARY_DOMAIN }}"
|
||||
|
@@ -5,8 +5,9 @@
|
||||
vars:
|
||||
flush_handlers: true
|
||||
when:
|
||||
- run_once_web_svc_collabora is not defined
|
||||
- NEXTCLOUD_COLLABORA_ENABLED
|
||||
- run_once_web_svc_collabora is not defined
|
||||
- NEXTCLOUD_COLLABORA_ENABLED | bool
|
||||
|
||||
|
||||
- name: "include role for {{ application_id }} to receive certs & do modification routines"
|
||||
include_role:
|
||||
@@ -59,7 +60,6 @@
|
||||
- name: Load system configuration steps
|
||||
include_tasks: "{{ item }}"
|
||||
loop:
|
||||
- 02_upgrade.yml
|
||||
- 03_admin.yml
|
||||
- 04_system_config.yml
|
||||
|
||||
|
@@ -3,4 +3,7 @@
|
||||
|
||||
- name: Set Nextcloud LDAP bind password
|
||||
command: >
|
||||
{{ NEXTCLOUD_DOCKER_EXEC_OCC }} ldap:set-config s01 ldapAgentPassword "{{ ldap.bind_credential }}"
|
||||
{{ NEXTCLOUD_DOCKER_EXEC_OCC }} ldap:set-config s01 ldapAgentPassword "{{ ldap.bind_credential }}"
|
||||
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
||||
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
||||
no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
|
@@ -68,4 +68,5 @@ nextcloud_docker_include_instructions_file: "/tmp/includes.php"
|
||||
|
||||
## Execution
|
||||
NEXTCLOUD_DOCKER_EXEC: "docker exec -u {{ NEXTCLOUD_DOCKER_USER }} {{ NEXTCLOUD_CONTAINER }}" # General execute composition
|
||||
NEXTCLOUD_DOCKER_EXEC_OCC: "{{NEXTCLOUD_DOCKER_EXEC}} {{ NEXTCLOUD_DOCKER_WORK_DIRECTORY }}occ" # Execute docker occ command
|
||||
NEXTCLOUD_DOCKER_EXEC_OCC: "{{NEXTCLOUD_DOCKER_EXEC}} {{ NEXTCLOUD_DOCKER_WORK_DIRECTORY }}occ" # Execute docker occ command
|
||||
# NEXTCLOUD_COLLOBORA_CONF_EXEC: "docker exec {{ applications | get_app_conf('web-svc-collabora', 'docker.services.collabora.name') }} coolconfig"
|
Reference in New Issue
Block a user