X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=513d1ff199f9bec9feabdf7f5c3e70d9c0e45c74;hb=e1b0adaaa36ee0c5de7e7512a04247778850b164;hp=f57efd2daa95eeba2bb152474211f2fad8f76538;hpb=13ac49fbe5218c5f66d04312625e9a492500ae8c;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f57efd2da..513d1ff19 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -31,7 +31,10 @@ node default {
     include ntp
 
     include motd
-    include samhain
+
+    case $hostname {
+        finzi,fano,fasch,field:    { include kfreebsd }
+    }
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -39,6 +42,9 @@ node default {
     case $kvmdomain {
         "true":    { package { acpid: ensure => installed } }
     }
+    case $mptraid {
+        "true":    { include "raidmpt" }
+    }
 
     case $mta {
         "exim4":   {
@@ -74,10 +80,11 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
+        bartok:                   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3: { include ferm }
+        logtest01,geo1,geo2,geo3,bartok: { include ferm }
     }
 
     case $brokenhosts {
@@ -89,4 +96,5 @@ node default {
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
+    include samhain
 }