X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=28db182df7cf3a1a9c93bc417d1a7962ca3e1bf3;hb=38bca420ba29405e30dfd9021e20a5fc3695e8c4;hp=08f6c850de0fa640abe55bdc00f67ba8909bd685;hpb=7c4ae3fd1f04382f1478bc9d01275e29cde71355;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 08f6c850d..28db182df 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,10 +9,21 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
-    include samhain
+    include sudo
     include debian-org
+    include monit
+    include apt-keys
+
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -20,12 +31,49 @@ node default {
     }
 
     case $mta {
-        "exim4":   { include exim }
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
+                  default: { include exim }
+             }
+        }
+        default:   {}
+    }
+
+
+    case $hostname {
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
+    }
+
+    case $apache2 {
+        "true":    { case $hostname {
+                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
+                        default:   {}
+                   } }
+        default: {}
+    }
+
+    case $hostname {
+        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
+                   { include buildd }
         default:   {}
     }
 
+# maybe wait for rietz to be upgraded to lenny
+#    case $hostname {
+#        rietz,raff,klecker:
+#                   { include named-secondary }
+#        default:   {}
+#    }
+
     case $hostname {
-        spohr:     { include nagiosclient }
+        geo1,geo2,geo3:
+                   { include geodns }
         default:   {}
     }
 }