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

diff --git a/manifests/site.pp b/manifests/site.pp
index fcf97e889..d5b6ab6c8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,33 +14,37 @@ Exec {
 }
 
 node default {
+    $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
     include debian-org
     include monit
     include apt-keys
-
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+    include ntp
 
     include motd
     include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
-        default: {}
     }
 
     case $mta {
         "exim4":   {
-             case $nodeinfo['heavy_exim'] {
-                  "true":  { include eximmx }
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
                   default: { include exim }
              }
         }
-        default:   {}
     }
 
-
     case $hostname {
         spohr: {
                       include nagios::server
@@ -51,33 +55,30 @@ node default {
     }
 
     case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
-                        default:   {}
-                   } }
-        default: {}
+         "true":  {
+              case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+                     "true":  { include apache2::security_mirror }
+                     default: { include apache2 }
+              }
+         }
     }
 
-    case $hostname {
-        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
-                   { include buildd }
-        default:   {}
+    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 {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
+        rietz,raff,klecker: { include named::secondary }
     }
-}
 
-node penalosa inherits default {
-    include hosts
+    case $hostname {
+        geo1,geo2,geo3: { include named::geodns }
+    }
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $hoster {
+        "ubcece", "darmstadt":  { include resolv }
+    }
 }