Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index a88b728..8331d50 100644 (file)
--- 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
@@ -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 {