X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8331d5030ee126269d7042ffe476888366dab8ee;hb=d0de49978092bd8931bbf0538a8a45686135921d;hp=2e8000b060e8dd2786672563a8868c12e2eb25a8;hpb=e216061f35961159f2dbac3f4268f6acedc66c67;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 2e8000b06..8331d5030 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,6 +16,7 @@ Exec {
 node default {
     include munin-node
     include sudo
+    include ssh
     include debian-org
     include monit
     include apt-keys
@@ -55,11 +56,15 @@ node default {
            default: { }
      }
 
-    case $hostname {
-        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
-                   { include buildd }
-        default:   {}
-    }
+     case extractnodeinfo($nodeinfo, 'buildd') {
+          "true":  { include buildd }
+           default: { }
+     }
+     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+          "true":  { include apache2::security_mirror }
+           default: { }
+     }
+
 
 # maybe wait for rietz to be upgraded to lenny
 #    case $hostname {
@@ -73,8 +78,8 @@ node default {
                     { include geodns }
          default:   {}
      }
-}
-
-node penalosa inherits default {
-    include hosts
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }