From: Stephen Gran <steve@lobefin.net>
Date: Sat, 1 Aug 2009 14:03:21 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b233cbf36fe50a47edd458cc29b8ba9806273e2c;hp=-c;p=mirror%2Fdsa-puppet.git

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

b233cbf36fe50a47edd458cc29b8ba9806273e2c
diff --combined manifests/site.pp
index 70b672223,a4d13e6ac..8331d5030
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@@ -16,7 -16,6 +16,7 @@@ Exec 
  node default {
      include munin-node
      include sudo
 +    include ssh
      include debian-org
      include monit
      include apt-keys
@@@ -60,6 -59,11 +60,11 @@@
            "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 {