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

diff --git a/manifests/site.pp b/manifests/site.pp
index a88b72801..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 {