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

diff --git a/manifests/site.pp b/manifests/site.pp
index 2e636b58e..28db182df 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,17 +18,25 @@ node default {
     include sudo
     include debian-org
     include monit
-    include samhain
+    include apt-keys
 
     $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
 
+    include motd
+    include samhain
+
     case $smartarraycontroller {
         "true":    { include debian-proliant }
         default: {}
     }
 
     case $mta {
-        "exim4":   { include exim }
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
+                  default: { include exim }
+             }
+        }
         default:   {}
     }
 
@@ -36,27 +44,33 @@ node default {
     case $hostname {
         spohr: {
                       include nagios::server
-                      include motd::new
         }
         default: {
 		      include nagios::client
-                      include motd
 	}
     }
 
     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 }