attempt to work around puppets crazy scoping

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

diff --git a/manifests/site.pp b/manifests/site.pp
index ba2dcef..d5b6ab6 100644 (file)
--- 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
@@ -42,7 +45,6 @@ node default {
         }
     }
 
-
     case $hostname {
         spohr: {
                       include nagios::server
@@ -52,27 +54,31 @@ node default {
        }
     }
 
-     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-          "true":  { include apache2 }
-     }
-
-     case extractnodeinfo($nodeinfo, 'buildd') {
-          "true":  { include buildd }
-     }
-     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-          "true":  { include apache2::security_mirror }
-     }
+    case $apache2 {
+         "true":  {
+              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+                     "true":  { include apache2::security_mirror }
+                     default: { include apache2 }
+              }
+         }
+    }
 
+    case extractnodeinfo($nodeinfo, 'buildd') {
+         "true":  { include buildd }
+    }
 
 # maybe wait for rietz to be upgraded to lenny
     case $hostname {
         rietz,raff,klecker: { include named::secondary }
     }
 
-     case $hostname {
-         geo1,geo2,geo3: { include named::geodns }
-     }
-     case $brokenhosts {
-         "true":    { include hosts }
-     }
+    case $hostname {
+        geo1,geo2,geo3: { include named::geodns }
+    }
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $hoster {
+        "ubcece", "darmstadt":  { include resolv }
+    }
 }