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

Conflicts:
	manifests/site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 291ce2f..ef98dfc 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -82,13 +82,18 @@ node default {
         geo1,geo2,geo3:           { include named::geodns }
         bartok:                   { include named::recursor }
     }
-    
+
+    case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+        true: { include rsync }
+        true: { include ftp }
+    }
+
     case $hostname {
        senfl: { include rsync }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti: { include ferm }
+        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens: { include ferm }
     }
     case $hostname {
         piatti: {
@@ -97,6 +102,7 @@ node default {
                rule         => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))"
            }
         }
+
     }
     case $brokenhosts {
         "true":    { include hosts }