From f79fec1356d7b1da15ab94384068af0199652ffa Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Sun, 1 Sep 2019 23:35:15 +0200
Subject: [PATCH] moved resolver to nginx dict

---
 README.md             | 8 +++-----
 defaults/main.yml     | 6 +++---
 templates/dns.conf.j2 | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 74322e4..315e370 100644
--- a/README.md
+++ b/README.md
@@ -8,17 +8,15 @@ Other versions might work but are not tested.
 
 ## Parameters and defaults
 
-DNS resolver have to be defined in the `resolver` array. Defaults: 
+
+All configuration is to be placed inside the `nginx` dict.
 
 ```
+#  array of DNS resolvers
 resolver:
   - 8.8.8.8
   - 8.8.4.4
-```
 
-All other configuration is to be placed inside the `nginx` dict.
-
-```
 # name: *upstreamconfig*, see below for definition
 upstreams: {}
 
diff --git a/defaults/main.yml b/defaults/main.yml
index fdb15fc..4c015ed 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,3 @@
-resolver:
-  - 8.8.8.8
-  - 8.8.4.4
 
 nginx:
   real_ip_from:
@@ -12,3 +9,6 @@ nginx:
   force_ssl: true
   upstreams: {}
   vhosts: {}
+  resolver:
+    - 8.8.8.8
+    - 8.8.4.4
diff --git a/templates/dns.conf.j2 b/templates/dns.conf.j2
index 5f85656..3d01a97 100644
--- a/templates/dns.conf.j2
+++ b/templates/dns.conf.j2
@@ -1,2 +1,2 @@
-resolver {{ resolver|join(' ') }};
+resolver {{ nginx.resolver|join(' ') }};
 resolver_timeout 5s;