X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d4f7b84a76bd80f2d1a3829fe8e106df24e2fdd5;hb=6e15bf83682748c31c4d369b960d88078bd474f0;hp=b7ba75cde047f1c035d2ca9e880917d6ae0fdf6f;hpb=08549363d538e11e3424d51bc719abf360083258;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index b7ba75cde..d4f7b84a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -83,20 +83,21 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok,schein,steffani,ries,franck,liszt,master:   { include named::recursor }
+        bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani:   { include named::recursor }
+    }
+
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+        }
     }
 
     case $hostname {
-        cilea,merikanto,ravel,paganini,sibelius: {}
-        default: {
-             case $kernel {
-                 Linux: {
-                     include ferm
-                 }
-             }
-         }
+        beethoven,ravel,spohr: {
+            include nfs-server
+        }
     }
-    include ferm::per-host
 
     case $brokenhosts {
         "true":    { include hosts }
@@ -109,3 +110,7 @@ node default {
     }
     include samhain
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: