X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=28db182df7cf3a1a9c93bc417d1a7962ca3e1bf3;hb=daf8174d2e3a7006bdb3b5d728c281250a973bb6;hp=f2642306eb687f3c87522890fda79a41ff90126a;hpb=1bfbd12a4e812a98a12ffe780e45da4aa43a65be;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f2642306e..28db182df 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,7 +18,12 @@ node default {
     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 }
@@ -26,39 +31,46 @@ 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 }
-    }
 
     case $hostname {
-        spohr:     {
-                      import "nagios"
-                      include nagios-server
-                   }
-        default:   {}
+        spohr: {
+                      include nagios::server
+        }
+        default: {
+		      include nagios::client
+	}
     }
 
     case $apache2 {
         "true":    { case $hostname {
-                        carver,rore,tartini:  { include apache2 }
+                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
                         default:   {}
                    } }
         default: {}
     }
 
     case $hostname {
-        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
+        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 {
         geo1,geo2,geo3:
                    { include geodns }