X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=953000e6636b7dc4a3c87c9d68b37325aee80869;hb=37822cb6b7be585e3eb181b916161b736d2e2358;hp=86b8c718aeff8a7f01dd743775038303bae3adce;hpb=b1e1fbd9fddbcb3715eb914c2a01c6f8408dfea5;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 86b8c718a..953000e66 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -9,11 +9,21 @@ File {
     ensure  => file,
 }
 
+Exec {
+    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
 node default {
     include munin-node
     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 }
@@ -21,44 +31,47 @@ node default {
     }
 
     case $mta {
-        "exim4":   { include exim }
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
+                  default: { include exim }
+             }
+        }
         default:   {}
     }
 
-    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 }
+           default: { }
+     }
 
-    case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,tartini:  { include apache2 }
-                        default:   {}
-                   } }
-        default: {}
-    }
+     case extractnodeinfo($nodeinfo, 'buildd') {
+          "true":  { include buildd }
+           default: { }
+     }
 
-    case $hostname {
-        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
-                   { include buildd }
-        default:   {}
-    }
-    case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
-    }
+# 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:   {}
+     }
 }
 
 node penalosa inherits default {