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

diff --git a/manifests/site.pp b/manifests/site.pp
index 4f4d14aa6..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
@@ -50,19 +51,20 @@ node default {
 	}
     }
 
-    case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
-                        default:   {}
-                   } }
-        default: {}
-    }
+     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+          "true":  { include apache2 }
+           default: { }
+     }
+
+     case extractnodeinfo($nodeinfo, 'buildd') {
+          "true":  { include buildd }
+           default: { }
+     }
+     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+          "true":  { include apache2::security_mirror }
+           default: { }
+     }
 
-    case $hostname {
-        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
-                   { include buildd }
-        default:   {}
-    }
 
 # maybe wait for rietz to be upgraded to lenny
 #    case $hostname {
@@ -71,13 +73,13 @@ node default {
 #        default:   {}
 #    }
 
-#     case $hostname {
-#         geo1,geo2,geo3:
-#                    { include geodns }
-#         default:   {}
-#     }
-}
-
-node penalosa inherits default {
-    include hosts
+     case $hostname {
+         geo1,geo2,geo3:
+                    { include geodns }
+         default:   {}
+     }
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }