X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=192c5462e066702b7375caa07283f5e04e3fd06d;hb=c1e7c8f0dbbfaf406209a21d13cf752712562ba8;hp=06719f45950d80a00e37171c7ca29c182cda1c38;hpb=528754fc87a34d863d61e24824da39585865a0cb;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 06719f459..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
@@ -60,7 +61,7 @@ node default {
            default: { }
      }
      case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-          "true":  { include security_mirror }
+          "true":  { include apache2::security_mirror }
            default: { }
      }