X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=192c5462e066702b7375caa07283f5e04e3fd06d;hb=05c748b00f7d02cbbe8e4e0e64aee97f40ccd43b;hp=21351416a3aecadd9f6be967c6001ba129901b50;hpb=e3b2ac9b288d8001ace626d659aa862906d22da7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 21351416a..192c5462e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,5 +1,5 @@
 Package {
-    require => File["/etc/apt/apt.conf.d/local-recommends"]
+    require => [ Exec["apt-get update"], File["/etc/apt/apt.conf.d/local-recommends"] ]
 }
 
 File {
@@ -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 {
@@ -76,8 +78,8 @@ node default {
                     { include geodns }
          default:   {}
      }
-}
-
-node penalosa inherits default {
-    include hosts
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }