2 files changed, 20 insertions, 9 deletions
diff --git a/roles/apps/etherpad-lite/tasks/main.yml b/roles/apps/etherpad-lite/tasks/main.yml
index 072a6c09..a3b167a8 100644
--- a/roles/apps/etherpad-lite/tasks/main.yml
+++ b/roles/apps/etherpad-lite/tasks/main.yml
@@ -108,13 +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') }}"
-      acme: true
-      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