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

diff --git a/manifests/site.pp b/manifests/site.pp
index 337f9c57..9398f1c1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -15,6 +15,8 @@ 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")
+    notice("hoster for ${fqdn} is ${hoster}")
 
     include munin-node
     include sudo
@@ -22,13 +24,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 +40,8 @@ node default {
                   default: { include exim }
              }
         }
-        default:   {}
     }
 
-
     case $hostname {
         spohr: {
                       include nagios::server
@@ -51,40 +51,30 @@ node default {
 	}
     }
 
-     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
-          "true":  { include apache2 }
-           default: { }
-     }
+    case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+         "true":  { include apache2 }
+    }
 
-     case extractnodeinfo($nodeinfo, 'buildd') {
-          "true":  { include buildd }
-           default: { }
-     }
-     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-          "true":  { include apache2::security_mirror }
-           default: { }
-     }
+    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 {
-        rietz,raff,klecker:
-                   { include named::secondary }
-        default:   {}
+        rietz,raff,klecker: { include named::secondary }
     }
 
-     case $hostname {
-         geo1,geo2,geo3:
-                    {
-                      include named::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":  { include resolv }
+    }
 }