diff options
| -rw-r--r-- | inventory/host_vars/sk-cloudia/collabora.yml | 13 | ||||
| -rw-r--r-- | roles/collabora/code/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/collabora/code/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/collabora/code/templates/pod.yml.j2 | 10 |
4 files changed, 29 insertions, 4 deletions
diff --git a/inventory/host_vars/sk-cloudia/collabora.yml b/inventory/host_vars/sk-cloudia/collabora.yml index 15a1223f..b5a67bea 100644 --- a/inventory/host_vars/sk-cloudia/collabora.yml +++ b/inventory/host_vars/sk-cloudia/collabora.yml @@ -1,11 +1,16 @@ --- +collabora_code_base_path: /srv/storage/collabora/code + collabora_code_instances: o.skillz.biz: version: 4.0.6.1 port: 8200 hostnames: -# - o.skillz.biz - - office.elev8.at + - o.skillz.biz admin_user: admin -# admin_password: "{{ vault_collabora_code_admin_passwords['o.skillz.biz'] }}" - admin_password: S3cret + admin_password: "{{ vault_collabora_code_admin_passwords['o.skillz.biz'] }}" + ## TODO: fix this + # backend_storage: + # - wolke.elevate.at + # - insomnia.skillz.biz + # - nc.skillz.biz diff --git a/roles/collabora/code/defaults/main.yml b/roles/collabora/code/defaults/main.yml index af5a9e34..f17054ed 100644 --- a/roles/collabora/code/defaults/main.yml +++ b/roles/collabora/code/defaults/main.yml @@ -1,4 +1,6 @@ --- +collabora_code_base_path: /srv/collabora/code + # collabora_code_instances: # example: # version: 4.0.6.1 diff --git a/roles/collabora/code/tasks/main.yml b/roles/collabora/code/tasks/main.yml index 8682be98..77bd79a7 100644 --- a/roles/collabora/code/tasks/main.yml +++ b/roles/collabora/code/tasks/main.yml @@ -1,4 +1,12 @@ --- +- name: create collabora-code config subdirectory + loop: "{{ collabora_code_instances | list }}" + file: + path: "{{ collabora_code_base_path }}/{{ item }}/config" + state: directory + +## TODO: render config.xml + - name: generate pod manifests loop: "{{ collabora_code_instances | dict2items }}" loop_control: diff --git a/roles/collabora/code/templates/pod.yml.j2 b/roles/collabora/code/templates/pod.yml.j2 index 1efc57e7..ee4651a1 100644 --- a/roles/collabora/code/templates/pod.yml.j2 +++ b/roles/collabora/code/templates/pod.yml.j2 @@ -18,6 +18,16 @@ spec: value: "{{ item.value.admin_password }}" - name: "extra_params" value: "--o:ssl.enable=false --o:ssl.termination=true" + volumeMounts: + - name: config + mountPath: /etc/loolwsd/loolwsd.xml + subPath: loolwsd.xml + readOnly: true ports: - containerPort: 9980 hostPort: {{ item.value.port }} + volumes: + - name: config + hostPath: + path: "{{ collabora_code_base_path }}/{{ item.key }}/config/" + type: Directory |