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

diff --git a/manifests/site.pp b/manifests/site.pp
index b078599e3..d8a717ca8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,6 +29,7 @@ node default {
     include monit
     include apt-keys
     include ntp
+    include ssl
 
     include motd
 
@@ -43,13 +44,13 @@ node default {
         "true":    { package { acpid: ensure => installed } }
     }
     case $mptraid {
-        "true":    { include "raid-mpt" }
+        "true":    { include "raidmpt" }
     }
 
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  true:    { include exim::mx }
+                  'true':  { include exim::mx }
                   default: { include exim }
              }
         }
@@ -74,17 +75,33 @@ node default {
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
-         true:  { include buildd }
+         'true':  {
+             include buildd
+         }
     }
 
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok:                   { include named::recursor }
+        bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok: { include ferm }
+        cilea,luchesi,paganini,rautavaara,sibelius: {}
+        default: {
+             case $kernel {
+                 Linux: {
+                     include ferm
+                 }
+             }
+         }
+    }
+    include ferm::per-host
+
+    case $hostname {
+        beethoven,ravel,spohr: {
+            include nfs-server
+        }
     }
 
     case $brokenhosts {