X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d5b6ab6c8493b8c42fd7b9dc7b6cdf35979beb4d;hb=b961ac106252546fafa64ca3344d36a31b2e1bd8;hp=fef361e6df06c166eb9800b9b1c86c8897396de4;hpb=a7ce759a7185ec3a6a9ef5694fb5cbf832b234d8;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index fef361e6d..d5b6ab6c8 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")
+    $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.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}")
 
+    $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 {
@@ -74,4 +78,7 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
+    case $hoster {
+        "ubcece", "darmstadt":  { include resolv }
+    }
 }