Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 5dca0c4..bcf57b8 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -77,29 +77,24 @@ node default {
     case extractnodeinfo($nodeinfo, 'buildd') {
          'true':  {
              include buildd
-             case $kernel {
-                 Linux: {
-                     include ferm
-                 }
-             }
          }
     }
 
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok,schein,steffani,ries,franck,liszt:   { include named::recursor }
-    }
-
-    case $hostname {
-        ries,franck,powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky,heininen,nielsen,kokkonen,kaufmann: { include ferm }
+        bartok,schein,steffani,ries,franck,liszt,master:   { include named::recursor }
     }
 
     case $hostname {
-        agricola,albeniz,gabrielli,merulo,paer,pergolesi,pescetti,smetana,sperger,zee,zelenka: { include ferm }
-    }
-    case $hostname {
-        busoni,englund,orff,duarte,grieg,soler,klecker,krenek,liszt,lindberg,morricone,respighi,scelsi,valente,vitry,vivaldi,wolkenstein,rietz,unger: { include ferm }
+        bellini,cilea,merikanto,petterson,sibelius: {}
+        default: {
+             case $kernel {
+                 Linux: {
+                     include ferm
+                 }
+             }
+         }
     }
 
     case $hostname {