shorten up the typing

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

diff --git a/modules/ferm/files/defs.conf b/modules/ferm/files/defs.conf
index 199034c11638629a483d266a9a0d7fe10f84752c..b78b9abf95183685073ecb07adf90397611d54a6 100644 (file)
--- a/modules/ferm/files/defs.conf
+++ b/modules/ferm/files/defs.conf
@@ -1,33 +1,31 @@
-@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);
 @def $HOST_NAGIOS = (192.25.206.57 192.25.206.33);
 
-@def $sgran   = (91.103.132.25);
+@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::dead:f00d);
+@def $sgran6     = (2001:4b10:100b::/48);
 @def $weasel6    = ();
 @def $zobel6     = ();
 @def $luca6      = ();