X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8157096cf2bd2e92deb390a0d8e41b932155e0ac;hb=b0eb25c561acdd61c98ac776e0012f718ed56fb6;hp=b078599e39278d0c87ae1f3bece166b36c1f8070;hpb=130267711a8f442e5c16c82c60597b72e76e78f2;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index b078599e3..8157096cf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -43,7 +43,7 @@ node default {
         "true":    { package { acpid: ensure => installed } }
     }
     case $mptraid {
-        "true":    { include "raid-mpt" }
+        "true":    { include "raidmpt" }
     }
 
     case $mta {
@@ -83,8 +83,17 @@ node default {
         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: { include ferm }
+        logtest01,geo1,geo2,geo3,bartok,senfl,saens: { include ferm }
     }
 
     case $brokenhosts {