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

diff --git a/manifests/site.pp b/manifests/site.pp
index f834f8095..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
@@ -32,8 +33,8 @@ node default {
 
     case $mta {
         "exim4":   {
-             case $hostname {
-                  powell:  { include exim::mx }
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
                   default: { include exim }
              }
         }
@@ -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:   {}
+     }
 }