X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=b5a9709065730df1e18d3aebb429c4f6973bc07d;hb=d5532518c9a0f1120390bd39c251c256b96481c7;hp=d8d74907a10d2a3680a478e613ec0a698de8670a;hpb=9ea014717bb5a43ef416e03ad07fbe544fb7cbbc;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index d8d74907..b5a97090 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -18,11 +18,12 @@ 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")
 
-    $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
-    notice($nodeinfo.class)
-    notice($nodeinfo)
+    include motd
+    include samhain
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -30,7 +31,12 @@ node default {
     }
 
     case $mta {
-        "exim4":   { include exim }
+        "exim4":   {
+             case $hostname {
+                  raff,gluck,merkel,spohr,draghi,master,ries,rietz,klecker,powell:  { include exim::mx }
+                  default: { include exim }
+             }
+        }
         default:   {}
     }
 
@@ -38,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 }