cleanup a bit

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

diff --git a/modules/ferm/files/defs.conf b/modules/ferm/files/defs.conf
index b16d0209526f0d7d59d00c0f32b723edc3b64e4f..608e89fbf7e8fa72558be35a0b7ec56acc321474 100644 (file)
--- a/modules/ferm/files/defs.conf
+++ b/modules/ferm/files/defs.conf
@@ -12,12 +12,11 @@
 }
 
 @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  = ();