X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=64b54d2dddfcd019585ee20b9bf074f11bac1e58;hb=7b95faf44b2bbe383548ca5db4ac5e948e8db705;hp=b8f396b91d4a574f0050bcbdd0a63fb6015ad0f8;hpb=4bf513c1a0cd1df172d6e4a6ca26e05cf03d450d;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index b8f396b9..64b54d2d 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
@@ -29,7 +34,9 @@ node default {
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
-        default: {}
+    }
+    case $kvmdomain {
+        "true":    { package { acpid: ensure => installed } }
     }
 
     case $mta {
@@ -39,10 +46,8 @@ node default {
                   default: { include exim }
              }
         }
-        default:   {}
     }
 
-
     case $hostname {
         spohr: {
                       include nagios::server
@@ -52,38 +57,30 @@ 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:   {}
+        rietz,klecker,ravel,senfl: { include named::secondary }
     }
 
-     case $hostname {
-         geo1,geo2,geo3:
-                    {
-                      include named::geodns
-                    }
-         default:   {
-                    }
-     }
-     case $brokenhosts {
-         "true":    { include hosts }
-         default:   {}
-     }
+    case $hostname {
+        geo1,geo2,geo3: { include named::geodns }
+    }
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $hoster {
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
+    }
 }