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

diff --git a/manifests/site.pp b/manifests/site.pp
index fce042a4..9398f1c1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,59 +9,72 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 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
+    include ssh
     include debian-org
     include monit
+    include apt-keys
+    include ntp
+
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
-        default: {}
     }
 
     case $mta {
-        "exim4":   { include exim }
-        default:   {}
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
+                  default: { include exim }
+             }
+        }
     }
 
-    import "nagios"
-    include nagios-client
-
     case $hostname {
-        morales:   {}
-        default:   { include samhain }
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
     }
 
-    case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
-        default:   {}
+    case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+         "true":  { include apache2 }
     }
 
-    case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,tartini:  { include apache2 }
-                        default:   {}
-                   } }
-        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 {
-        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
-                   { include buildd }
-        default:   {}
+        rietz,raff,klecker: { include named::secondary }
     }
+
     case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
+        geo1,geo2,geo3: { include named::geodns }
+    }
+    case $brokenhosts {
+        "true":    { include hosts }
+    }
+    case $hoster {
+        "ubcece":  { include resolv }
     }
-}
-
-node penalosa inherits default {
-    include hosts
-    include motd
 }