X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f56d6ed3d2da1da0218c1fed67a953e651d67485;hb=cd48253c330c5b6a42f3f280f97ebcd95958412c;hp=e5f1e12aa616f567822f5682359aeb4bbf9f894f;hpb=8aaa2ec3df6206ed9c27c3a7f308ec212a0dd037;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index e5f1e12aa..f56d6ed3d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,10 +35,6 @@ node default {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
-    case $hostname {
-        heininen,unger,rautavaara,englund,salieri: { include entropykey }
-    }
-
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
@@ -84,6 +80,9 @@ node default {
               case getfromhash($nodeinfo, 'apache2_www_mirror') {
                      true:    { include apache2::www_mirror }
               }
+              case getfromhash($nodeinfo, 'apache2_backports_mirror') {
+                     true:    { include apache2::backports_mirror }
+              }
               include apache2
          }
     }
@@ -100,9 +99,9 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
-        geo1,geo2,geo3:                  { include named::geodns }
-        liszt:                           { include named::recursor }
+        klecker,ravel,senfl,orff,draghi,diamond: { include named::authoritative }
+        geo1,geo2,geo3:                          { include named::geodns }
+        liszt:                                   { include named::recursor }
     }
     case $hostname {
         franck,master,lobos,samosa,spohr,widor:   { include unbound }
@@ -123,7 +122,7 @@ node default {
     }
 
     case $hostname {
-        beethoven,ravel,spohr,stabile: {
+        beethoven,duarte,ravel,spohr,stabile: {
             include nfs-server
         }
     }
@@ -155,7 +154,12 @@ node default {
         chopin,geo3,soler,wieck: {
             include debian-radvd
         }
-   }
+    }
+
+    case $kernel {
+        Linux: { include entropykey }
+    }
+
 }
 
 # vim:set et: