Adding sarah to salt pillar

diff --git a/bind/common.sls b/bind/common.sls
index 0380f9ca5a45b4cdaf312dc929c8c7375fbe5c2f..124e6653fa6a7664917d3e37ab96c783f5c27964 100644 (file)
--- a/bind/common.sls
+++ b/bind/common.sls
@@ -264,11 +264,6 @@ bind:
         maria.acwain.net: 144.76.221.169
       slaves:
         ns3.uhu-banane.de: 185.102.95.107
-    hajo-doehring.de:
-      master:
-        maria.acwain.net: 144.76.221.169
-      slaves:
-        ns3.uhu-banane.de: 185.102.95.107
     hausarztpraxis-hoheluft.de:
       master:
         maria.acwain.net: 144.76.221.169

diff --git a/resolver/pb-fra.sls b/resolver/pb-fra.sls
index 8f2dc76d4ae72d240b995bca99ab0928c4ad41fa..c2a3dd29a952c0e5e33ffa11782c88fd05cc2912 100644 (file)
--- a/resolver/pb-fra.sls
+++ b/resolver/pb-fra.sls
@@ -1,4 +1,5 @@
 resolver:
   nameserver:
+    - 10.12.20.2
     - 185.48.118.6
     - 185.48.116.10

diff --git a/top.sls b/top.sls
index 8aa1f32aa4cd53f7902be3bc57dd150c05f02a10..cb8ceb7854afc82820c1843a8aa82e3154a8984c 100644 (file)
--- a/top.sls
+++ b/top.sls
@@ -13,6 +13,13 @@ base:
     - bind.common
     - bind.secondary
 
+  'sarah.uhu-banane.de':
+    - location.pb-fra
+    - postfix.satellite
+    - debian.openssh
+    - resolver.common
+    - resolver.pb-fra
+
   'ns2.uhu-banane.de':
     - location.pb-las
     - postfix.satellite