From bd9efe293975f3eaf36e06956d14625514e7ddd5 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Thu, 18 Jul 2019 00:16:24 +0200
Subject: [PATCH] fix some templating issues

---
 defaults/main.yml                            |  4 ++--
 tasks/install.yml                            | 10 +++-------
 templates/etc/nginx/sites-available/vhost.j2 |  4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index fb505c6..8eda029 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -93,9 +93,9 @@ nginx_vhosts_dir: /var/www/vhosts
 
 nginx_vhosts_default:
   - file: default
-    server:
+    servers:
       - port: 80
-        server_name: "{{ ansible_hostname }}"
+        server_name: "{{ ansible_fqdn }}"
         locations:
           - match: /
             root: /var/www/vhosts/default
diff --git a/tasks/install.yml b/tasks/install.yml
index ee12fc1..ef2f923 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -122,9 +122,7 @@
         owner: root
         group: root
         mode: 0640
-      loop:
-        - nginx_vhosts_default
-        - nginx_vhosts_extra
+      loop: "{{ nginx_vhosts_default + nginx_vhosts_extra }}"
       loop_control:
         label: "{{ item.file }}"
       notify: __nginx_reload
@@ -133,10 +131,8 @@
       file:
         src: "/etc/nginx/sites-available/{{ item.file }}"
         dest: "/etc/nginx/sites-enabled/{{ item.file }}"
-        state: "{{ 'link' when item.state == 'enabled' else 'absent' }}"
-      loop:
-        - nginx_vhosts_default
-        - nginx_vhosts_extra
+        state: "{{ 'link' if item.enabled | default(True) | bool else 'absent' }}"
+      loop: "{{ nginx_vhosts_default + nginx_vhosts_extra }}"
       loop_control:
         label: "{{ item.file }}"
       notify: __nginx_reload
diff --git a/templates/etc/nginx/sites-available/vhost.j2 b/templates/etc/nginx/sites-available/vhost.j2
index 0ab3e4d..82f8b87 100644
--- a/templates/etc/nginx/sites-available/vhost.j2
+++ b/templates/etc/nginx/sites-available/vhost.j2
@@ -11,7 +11,7 @@ upstream {{ item.upstream.name }} {
 {% endif %}
 {% for server in item.servers %}
 server {
-    listen       {{ server.port }} {{ 'ssl' if server.tls is defined and server.tls else '' }};
+    listen       {{ server.port }}{{ ' ssl' if server.tls is defined and server.tls else '' }};
     server_name  {{ server.server_name }};
 
     {% if server.tls is defined and server.tls %}
@@ -29,7 +29,7 @@ server {
         client_max_body_size {{ server.client_max_body_size }};
     {% endif %}
     {% for location in server.locations %}
-    location {{ location.match }}
+    location {{ location.match }} {
         {% if location.root is defined and location.root %}
         root   {{ location.root }};
         {% endif %}