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

diff --git a/manifests/site.pp b/manifests/site.pp
index 4f44fafdb..8157096cf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -42,6 +42,9 @@ node default {
     case $kvmdomain {
         "true":    { package { acpid: ensure => installed } }
     }
+    case $mptraid {
+        "true":    { include "raidmpt" }
+    }
 
     case $mta {
         "exim4":   {
@@ -80,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 {