next try

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 953000e6636b7dc4a3c87c9d68b37325aee80869..a4d13e6acd57b621347bd650ffa586ce98262549 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -59,6 +59,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 +77,8 @@ node default {
                     { include geodns }
          default:   {}
      }
-}
-
-node penalosa inherits default {
-    include hosts
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }