how about I add the right ip for weasel?

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

diff --git a/modules/ferm/files/defs.conf b/modules/ferm/files/defs.conf
index b5d019dab0fdd883b83ca6659555121d5226d1ab..b16d0209526f0d7d59d00c0f32b723edc3b64e4f 100644 (file)
--- a/modules/ferm/files/defs.conf
+++ b/modules/ferm/files/defs.conf
@@ -1,21 +1,19 @@
-@def &SERVICE($proto, $port) = {
- domain (ip ip6) chain INPUT proto $proto dport $port ACCEPT;
-}
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
 
-@def &V4_SERVICE($proto, $port) = {
- domain ip chain INPUT proto $proto dport $port ACCEPT;
-}
-
-@def &V6_SERVICE($proto, $port) = {
- domain ip6 chain INPUT proto $proto dport $port ACCEPT;
+@def &SERVICE($proto, $port) = {
+ proto $proto 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 &SERVICE_RANGE($proto, $port, $srange) = {
+ proto $proto mod state state (NEW) dport $port saddr ($srange) ACCEPT;
 }
 
-@def &V6_SERVICE_RANGE($proto, $port, $srange) = {
- domain ip6 chain INPUT proto $proto dport $port saddr $srange 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 $HOST_MUNIN  = (192.25.206.57 192.25.206.33);
@@ -28,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);