3 files changed, 15 insertions, 11 deletions
diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml
index ae4aa9d4..0a7930e3 100644
--- a/roles/nginx/defaults/main.yml
+++ b/roles/nginx/defaults/main.yml
@@ -10,4 +10,4 @@ nginx_pkg_name: nginx-light
 #       - www.example.com
 #     proxy_pass: http://127.0.0.1:8080
 #   other.io:
-#     contents: "<< nginx vhost config file contents >>"
+#     content: "<< nginx vhost config file contents >>"
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