From 7e6b94696e140348397c3c5bfadd1bdbf17ba2ec Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 12 Oct 2019 03:18:19 +0200
Subject: fix nginx role

---
 roles/nginx/tasks/acme.yml |  6 ------
 roles/nginx/tasks/main.yml | 18 ++++++++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'roles/nginx/tasks')

diff --git a/roles/nginx/tasks/acme.yml b/roles/nginx/tasks/acme.yml
index c08c0a57..b8ab7879 100644
--- a/roles/nginx/tasks/acme.yml
+++ b/roles/nginx/tasks/acme.yml
@@ -33,12 +33,6 @@
         dest: "/var/lib/acme/live/{{ acme_missing_hostname }}"
         state: link
 
-- name: enable vhost config using acme cert
-  file:
-    src: ../sites-available/liquidtruth
-    dest: /etc/nginx/sites-enabled/liquidtruth
-    state: link
-
 - name: make sure nginx config has been (re)loaded
   meta: flush_handlers
 
diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 19791235..42700db6 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -39,15 +39,25 @@
   loop: "{{ nginx_vhosts | dict2items }}"
   loop_control:
     label: "{{ item.key }}"
-  when: "'contents' in item.value"
+  when: "'content' in item.value"
   copy:
-    contents: "{{ item.value.contents }}"
+    content: "{{ item.value.content }}"
     dest: "/etc/nginx/sites-available/{{ item.key }}"
   notify: restart nginx
 
+- name: enable vhost config
+  loop: "{{ nginx_vhosts | dict2items }}"
+  loop_control:
+    label: "{{ item.key }}"
+  file:
+    src: "../sites-available/{{ item.key }}"
+    dest: "/etc/nginx/sites-enabled/{{ item.key }}"
+    state: link
+  notify: restart nginx
+
 - name: generate acme certificate
   loop: "{{ nginx_vhosts | dict2items }}"
   loop_control:
-    label: "{{ item.key }} ({{ item.value.hostnames | join(', ') }})"
-  when: item.value.acme
+    label: "{{ item.key }} ({{ item.value.hostnames | default([]) | join(', ') }})"
+  when: "'acme' in item.value  and  item.value.acme"
   include_tasks: acme.yml
-- 
cgit v1.2.3