X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ffiles%2Fdefs.conf;h=b5d019dab0fdd883b83ca6659555121d5226d1ab;hb=5e44ff243547aa2036db0cc1af549f4b9523e6b4;hp=36cd5d4c3a8b9d1478343be4b9fd2411c5704fcf;hpb=618c807fb5ed28830a63ebf113170b461c6aa026;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/files/defs.conf b/modules/ferm/files/defs.conf
index 36cd5d4c3..b5d019dab 100644
--- a/modules/ferm/files/defs.conf
+++ b/modules/ferm/files/defs.conf
@@ -1,22 +1,34 @@
 @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.24/29);
+@def $weasel  = ();
+@def $zobel   = ();
+@def $luca    = ();
+@def $DSA_IPS = ($sgran $weasel $zobel $luca);
+
+@def $sgran6     = (2001:4b10:100b::/48);
+@def $weasel6    = ();
+@def $zobel6     = ();
+@def $luca6      = ();
+@def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6);