X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Ffiles%2Fdefs.conf;h=3e18b137e0cb26a1cf87bd0e4bc00976194a0e70;hb=99b35c3d2d8b3e973a19cc953da568f10ef2b839;hp=61284b65c23b63592909b9c99e28de05e7b0befd;hpb=f9c25cb358b13f87296da1b225a1301869a2a4a6;p=dsa-puppet.git

diff --git a/modules/ferm/files/defs.conf b/modules/ferm/files/defs.conf
index 61284b65..3e18b137 100644
--- a/modules/ferm/files/defs.conf
+++ b/modules/ferm/files/defs.conf
@@ -12,21 +12,27 @@
 }
 
 @def &TCP_UDP_SERVICE($port) = {
- proto tcp mod state state (NEW) dport $port ACCEPT;
- proto udp mod state state (NEW) dport $port ACCEPT;
+ proto (tcp udp) mod state state (NEW) dport $port ACCEPT;
 }
 
-@def $HOST_MUNIN  = (192.25.206.57 192.25.206.33);
-@def $HOST_NAGIOS = (192.25.206.57 192.25.206.33);
+@def $HOST_MUNIN  = (192.25.206.33);
+@def $HOST_NAGIOS = (206.12.19.118);
 
 @def $sgran   = (91.103.132.24/29);
 @def $weasel  = ();
+@def $weasel  = ($weasel 86.59.118.144/28); # debian@sil
+@def $weasel  = ($weasel 86.59.21.32/29); # anguilla1
+@def $weasel  = ($weasel 86.59.30.32/28); # anguilla2
+@def $weasel  = ($weasel 141.201.27.0/24); # came
+@def $weasel  = ($weasel 62.99.152.178); # argos.campus-sbg
 @def $zobel   = ();
 @def $luca    = ();
 @def $DSA_IPS = ($sgran $weasel $zobel $luca);
 
 @def $sgran6     = (2001:4b10:100b::/48);
-@def $weasel6    = (2001:41b8:202:deb:216:36ff:fe40:3904);
+@def $weasel6    = ();
+@def $weasel6    = ($weasel6 2001:826:408:200::/56); # came
+@def $weasel6    = ($weasel6 2001:858:10f::/48); # anguilla
 @def $zobel6     = ();
 @def $luca6      = ();
 @def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6);