Added resolver and Bind pillars

diff --git a/bind/common.sls b/bind/common.sls
index 1e9d5ff8c3f5b274005c1c5a8a4670daf9905b94..4b5e562a4223267cf4b37885e74f66384f631d5e 100644 (file)
--- a/bind/common.sls
+++ b/bind/common.sls
@@ -87,20 +87,30 @@ bind:
       - 185.102.95.107
       - 2a06:2380:0:1::3a
   my-zones:
-    - uhu-banane.eu:
-      - master:
+    uhu-banane.eu:
+      master:
         - ns3.uhu-banane.de
-      - slaves:
+      slaves:
         - ns1.uhu-banane.de
         - ns2.uhu-banane.de
-    - uhu-banane.org:
-      - master:
+    uhu-banane.org:
+      master:
         - ns3.uhu-banane.de
-      - slaves:
+      slaves:
         - ns1.uhu-banane.de
         - ns2.uhu-banane.de
+  dnssec:
+    rndc:
+      name: dns-uhu-banane
+      footprint: 36941
+      algo_nr: 165
+      algo_name: HMAC_SHA512
+      bits: AAA=
+      bits_num: 512
+      key:  tquzpUKZ03ybVm6y0UtM2mgaBFn9f9MOJYgGGYvYkw/sq6uIfNn7jM2J8K7AUx4yz9tgB5mBCH+spvu5PN32Cg==
+      date: 20160308160849
   soa-defaults:
-    - refresh: 10800
-    - retry: 3600
-    - expire: 604800
-    - minimum: 86400
+    refresh: 10800
+    retry: 3600
+    expire: 604800
+    minimum: 86400

diff --git a/resolver/common.sls b/resolver/common.sls
new file mode 100644 (file)
index 0000000..3496010
--- /dev/null
+++ b/resolver/common.sls
@@ -0,0 +1,19 @@
+{% if salt['grains.get']('fqdn') == 'ns3.uhu-banane.de' %}
+    {% set has_public_ipv6 = True %}
+{% else %}
+    {% set has_public_ipv6 = False %}
+{% endif %}
+
+resolver:
+  default-nameserver:
+    - 8.8.8.8
+    - 8.8.4.4
+{% if has_public_ipv6 %}
+    - 2001:4860:4860::8888
+{% endif %}
+  domain: uhu-banane.de
+  search:
+    - uhu-banane.de
+    - brehm-online.com
+    - hennig-berlin.org
+

diff --git a/resolver/pb-fra.sls b/resolver/pb-fra.sls
new file mode 100644 (file)
index 0000000..8f2dc76
--- /dev/null
+++ b/resolver/pb-fra.sls
@@ -0,0 +1,4 @@
+resolver:
+  nameserver:
+    - 185.48.118.6
+    - 185.48.116.10

diff --git a/resolver/pb-las.sls b/resolver/pb-las.sls
new file mode 100644 (file)
index 0000000..62bb681
--- /dev/null
+++ b/resolver/pb-las.sls
@@ -0,0 +1,4 @@
+resolver:
+  nameserver:
+    - 208.94.37.18
+    - 162.254.24.10

diff --git a/top.sls b/top.sls
index a4666ff39f7eebe84a522a044107bd4a54a6486b..b4f710aca61548cfcae72f293b64e8cc4d00c101 100644 (file)
--- a/top.sls
+++ b/top.sls
@@ -2,18 +2,23 @@ base:
   'ns1.uhu-banane.de':
     - postfix.satellite
     - debian.openssh
+    - resolver.common
+    - resolver.pb-fra
     - bind.common
     - bind.secondary
 
   'ns2.uhu-banane.de':
     - postfix.satellite
     - debian.openssh
+    - resolver.common
+    - resolver.pb-las
     - bind.common
     - bind.secondary
 
   'ns3.uhu-banane.de':
     - postfix.satellite
     - debian.openssh
+    - resolver.common
     - bind.common
     - bind.primary