From 14ec298f92e2494ca8a952e7ccfe7bd05d09b24c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 20 Jul 2016 00:12:58 +0200 Subject: [PATCH] Adding sarah to salt pillar --- bind/common.sls | 5 ----- resolver/pb-fra.sls | 1 + top.sls | 7 +++++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bind/common.sls b/bind/common.sls index 0380f9c..124e665 100644 --- 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 8f2dc76..c2a3dd2 100644 --- 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 8aa1f32..cb8ceb7 100644 --- 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 -- 2.39.5