X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=ac2723458689af6f58a179254ffe5941074ce157;hb=cc964c7b234b0cb8acef89d068ab5721d175bd24;hp=9398f1c11c9115d8c50acad39db090bf11c8cd17;hpb=c1f9b4855bc047dc0181065e0b25250e4e647246;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9398f1c1..ac272345 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,10 +14,13 @@ Exec {
 }
 
 node default {
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $hoster   = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+    $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+    $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
     notice("hoster for ${fqdn} is ${hoster}")
 
+    $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
+    $mxinfo   = allnodeinfo("mXRecord")
+
     include munin-node
     include sudo
     include ssh
@@ -51,17 +54,18 @@ node default {
 	}
     }
 
-    case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-         "true":  { include apache2 }
+    case $apache2 {
+         "true":  {
+              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+                     "true":  { include apache2::security_mirror }
+                     default: { include apache2 }
+              }
+         }
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
          "true":  { include buildd }
     }
-    case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-         "true":  { include apache2::security_mirror }
-    }
-
 
 # maybe wait for rietz to be upgraded to lenny
     case $hostname {
@@ -75,6 +79,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece":  { include resolv }
+        "ubcece", "darmstadt":  { include resolv }
     }
 }