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

Conflicts:
	manifests/site.pp

diff --cc manifests/site.pp
index 8157096,291ce2f..ef98dfc
--- 1/manifests/site.pp
--- 2/manifests/site.pp
+++ b/manifests/site.pp
@@@ -93,9 -88,16 +93,17 @@@ node default 
      }
  
      case $hostname {
-         logtest01,geo1,geo2,geo3,bartok,senfl,saens: { include ferm }
 -        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti: { include ferm }
++        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens: { include ferm }
      }
+     case $hostname {
+         piatti: {
+            @ferm::rule { "dsa-udd-stunnel":
+                description  => "port 8080 for udd stunnel",
+                rule         => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))"
+            }
+         }
 +
+     }
      case $brokenhosts {
          "true":    { include hosts }
      }