summaryrefslogtreecommitdiff
path: root/roles/apps/etherpad-lite/tasks
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2023-08-14 23:35:00 +0200
committerChristian Pointner <equinox@spreadspace.org>2023-08-20 22:12:03 +0200
commit55631d04f68bd4657ee5fb994a1fdfe32329af54 (patch)
treeebd8076bac4a82f2048a7d73b52abb21e65ac461 /roles/apps/etherpad-lite/tasks
parentcollabora/code: move to generic nginx-vhost template (diff)
etherpad-lite: move to generic nginx-vhost template
Diffstat (limited to 'roles/apps/etherpad-lite/tasks')
-rw-r--r--roles/apps/etherpad-lite/tasks/main.yml14
-rw-r--r--roles/apps/etherpad-lite/tasks/nginx-vhost.yml16
2 files changed, 20 insertions, 10 deletions
diff --git a/roles/apps/etherpad-lite/tasks/main.yml b/roles/apps/etherpad-lite/tasks/main.yml
index 495a0387..a3b167a8 100644
--- a/roles/apps/etherpad-lite/tasks/main.yml
+++ b/roles/apps/etherpad-lite/tasks/main.yml
@@ -108,14 +108,8 @@
include_role:
name: kubernetes/standalone/pod
-- name: configure nginx vhost
+- name: install nginx vhost config
loop: "{{ etherpad_lite_instances | dict2items }}"
- vars:
- nginx_vhost:
- name: "etherpad-lite-{{ item.key }}"
- content: "{{ lookup('template', 'nginx-vhost.conf.j2') }}"
- tls:
- certificate_provider: "{{ acme_client }}"
- hostnames: "{{ item.value.hostnames }}"
- include_role:
- name: nginx/vhost
+ loop_control:
+ label: "{{ item.key }}"
+ include_tasks: nginx-vhost.yml
diff --git a/roles/apps/etherpad-lite/tasks/nginx-vhost.yml b/roles/apps/etherpad-lite/tasks/nginx-vhost.yml
new file mode 100644
index 00000000..91c8b54d
--- /dev/null
+++ b/roles/apps/etherpad-lite/tasks/nginx-vhost.yml
@@ -0,0 +1,16 @@
+---
+- name: render nginx-vhost custom config
+ set_fact:
+ etherpad_lite_nginx_vhost_custom: "{{ lookup('template', 'nginx-vhost.conf.j2') }}"
+
+- name: configure nginx vhost
+ vars:
+ nginx_vhost:
+ name: "etherpad-lite-{{ item.key }}"
+ template: generic
+ tls:
+ certificate_provider: "{{ acme_client }}"
+ hostnames: "{{ item.value.hostnames }}"
+ custom: "{{ etherpad_lite_nginx_vhost_custom }}"
+ include_role:
+ name: nginx/vhost