X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ffiles%2Fdefs.conf;h=329d7ed79c176322587862f462951f0e234dc35d;hb=c426366b9b7f3bf6e405997ece777c9074069e9f;hp=0ca05050df8fa4d5367b15afd5b95e8a8b0bb8aa;hpb=37c25196ed4a77a0668117354622e6740659359e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/files/defs.conf b/modules/ferm/files/defs.conf
index 0ca05050d..329d7ed79 100644
--- a/modules/ferm/files/defs.conf
+++ b/modules/ferm/files/defs.conf
@@ -1,19 +1,28 @@
 @def &SERVICE($proto, $port) = {
-	domain (ip ip6) chain INPUT proto $proto dport $port ACCEPT;
+ domain (ip ip6) chain INPUT proto $proto dport $port ACCEPT;
 }
 
 @def &V4_SERVICE($proto, $port) = {
-	domain ip chain INPUT proto $proto dport $port ACCEPT;
+ domain ip chain INPUT proto $proto dport $port ACCEPT;
 }
 
 @def &V6_SERVICE($proto, $port) = {
-	domain ip6 chain INPUT proto $proto dport $port ACCEPT;
+ domain ip6 chain INPUT proto $proto dport $port ACCEPT;
 }
 
 @def &V4_SERVICE_RANGE($proto, $port, $srange) = {
-	domain ip chain INPUT proto $proto dport $port saddr $srange ACCEPT;
+ domain ip chain INPUT proto $proto dport $port saddr $srange ACCEPT;
 }
 
 @def &V6_SERVICE_RANGE($proto, $port, $srange) = {
-	domain ip6 chain INPUT proto $proto dport $port saddr $srange ACCEPT;
+ domain ip6 chain INPUT proto $proto dport $port saddr $srange ACCEPT;
 }
+
+@def $HOST_MUNIN  = (192.25.206.57 192.25.206.33);
+@def $HOST_NAGIOS = (192.25.206.57 192.25.206.33);
+
+@def $sgran  = (91.103.132.25 2001:4b10:100b::dead:f00d);
+@def $weasel = ();
+@def $zobel  = ();
+@def $luca   = ();
+@def $DSA_IPS = ($sgran $weasel $zobel $luca);