X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=192c5462e066702b7375caa07283f5e04e3fd06d;hb=c1e7c8f0dbbfaf406209a21d13cf752712562ba8;hp=953000e6636b7dc4a3c87c9d68b37325aee80869;hpb=4f92736eaa93b8637fc100c03ec6a7b52a01ebb1;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 953000e66..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
@@ -59,6 +60,11 @@ node default {
           "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 {
@@ -72,8 +78,8 @@ node default {
                     { include geodns }
          default:   {}
      }
-}
-
-node penalosa inherits default {
-    include hosts
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }