correct munin/nagios ip addresses

[dsa-puppet.git] / modules / ferm / files / defs.conf

diff --git a/modules/ferm/files/defs.conf b/modules/ferm/files/defs.conf
index 0359fa921814bb42101ef0ec2f27601506e8b58e..3c3bc30eb6905b0190cb2b07ae69b5b17afd42da 100644 (file)
--- a/modules/ferm/files/defs.conf
+++ b/modules/ferm/files/defs.conf
@@ -4,27 +4,20 @@
 ##
 
 @def &SERVICE($proto, $port) = {
- domain (ip ip6) chain INPUT proto $proto dport $port ACCEPT;
+ proto $proto mod state state (NEW) dport $port ACCEPT;
 }
 
-@def &V4_SERVICE($proto, $port) = {
- domain ip chain INPUT proto $proto dport $port ACCEPT;
+@def &SERVICE_RANGE($proto, $port, $srange) = {
+ proto $proto mod state state (NEW) dport $port saddr ($srange) ACCEPT;
 }
 
-@def &V6_SERVICE($proto, $port) = {
- domain ip6 chain INPUT proto $proto dport $port ACCEPT;
+@def &TCP_UDP_SERVICE($port) = {
+ proto tcp mod state state (NEW) dport $port ACCEPT;
+ proto udp mod state state (NEW) dport $port ACCEPT;
 }
 
-@def &V4_SERVICE_RANGE($proto, $port, $srange) = {
- 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;
-}
-
-@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  = ();
@@ -33,7 +26,7 @@
 @def $DSA_IPS = ($sgran $weasel $zobel $luca);
 
 @def $sgran6     = (2001:4b10:100b::/48);
-@def $weasel6    = ();
+@def $weasel6    = (2001:858:10f:20:217:a4ff:fe44:73a8);
 @def $zobel6     = ();
 @def $luca6      = ();
 @def $DSA_V6_IPS = ($sgran6 $weasel6 $zobel6 $luca6);