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

diff --git a/manifests/site.pp b/manifests/site.pp
index d8f1b09cb..d5b6ab6c8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,7 +14,12 @@ Exec {
 }
 
 node default {
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.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
@@ -22,13 +27,13 @@ node default {
     include debian-org
     include monit
     include apt-keys
+    include ntp
 
     include motd
     include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
-        default: {}
     }
 
     case $mta {
@@ -38,10 +43,8 @@ node default {
                   default: { include exim }
              }
         }
-        default:   {}
     }
 
-
     case $hostname {
         spohr: {
                       include nagios::server
@@ -51,40 +54,31 @@ node default {
 	}
     }
 
-     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-          "true":  { include apache2 }
-           default: { }
-     }
-
-     case extractnodeinfo($nodeinfo, 'buildd') {
-          "true":  { include buildd }
-           default: { }
-     }
-     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-          "true":  { include apache2::security_mirror }
-           default: { }
-     }
+    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 }
-#        default:   {}
-#    }
+    case $hostname {
+        rietz,raff,klecker: { include named::secondary }
+    }
 
-     case $hostname {
-         geo1,geo2,geo3:
-                    {
-                      include geodns
-                      include ntp::server
-                    }
-         default:   {
-                      include ntp::client
-                    }
-     }
-     case $brokenhosts {
-         "true":    { include hosts }
-         default:   {}
-     }
+    case $hostname {
+        geo1,geo2,geo3: { include named::geodns }
+    }
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $hoster {
+        "ubcece", "darmstadt":  { include resolv }
+    }
 }