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

diff --git a/manifests/site.pp b/manifests/site.pp
index c9afa69bf..d4f7b84a7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -86,20 +86,15 @@ node default {
         bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
-    case $hostname {
-        cilea,luchesi,merikanto,paganini,rautavaara,sibelius: {}
-        default: {
-             case $kernel {
-                 Linux: {
-                     include ferm
-                 }
-             }
-         }
+    case $kernel {
+        Linux: {
+            include ferm
+            include ferm::per-host
+        }
     }
-    include ferm::per-host
 
     case $hostname {
-        ravel,spohr: {
+        beethoven,ravel,spohr: {
             include nfs-server
         }
     }
@@ -115,3 +110,7 @@ node default {
     }
     include samhain
 }
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: