Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  cleanup a bit

diff --combined modules/ferm/files/defs.conf
index d049e1996c053d1892a46cb5e68047d8ab763e9f,608e89fbf7e8fa72558be35a0b7ec56acc321474..d368667fe2547b2f2ec8a331b0b7e470af0038e1
--- 1/modules/ferm/files/defs.conf
--- 2/modules/ferm/files/defs.conf
+++ b/modules/ferm/files/defs.conf
@@@ -12,28 -12,20 +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.33);
  @def $HOST_NAGIOS = (206.12.19.118);
  
  @def $sgran   = (91.103.132.24/29);
 -@def $weasel  = ();
 +@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:858:10f:20:217:a4ff:fe44:73a8);
 +@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);