X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=fcf97e889417542402f7dcb4d16fa4cce1f6d5aa;hb=b8fa816fa0c7ec2dc5d626b16ec4ef5f2afe1b6d;hp=e8f5dfcb60be9f28c1a5d5dc441db83d2a798497;hpb=7a82591e6beeaa212dc23815c42349ca4fe08e4d;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index e8f5dfcb6..fcf97e889 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,19 +18,25 @@ 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
 
-    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
-    notice($nodeinfo)
-
     case $smartarraycontroller {
         "true":    { include debian-proliant }
         default: {}
     }
 
     case $mta {
-        "exim4":   { include exim }
+        "exim4":   {
+             case $nodeinfo['heavy_exim'] {
+                  "true":  { include eximmx }
+                  default: { include exim }
+             }
+        }
         default:   {}
     }
 
@@ -46,17 +52,25 @@ node default {
 
     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 }