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

diff --git a/manifests/site.pp b/manifests/site.pp
index 2e636b58e..af7c23d9c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,13 +14,17 @@ Exec {
 }
 
 node default {
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
     include munin-node
     include sudo
+    include ssh
     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 }
@@ -28,7 +32,12 @@ node default {
     }
 
     case $mta {
-        "exim4":   { include exim }
+        "exim4":   {
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
+                  default: { include exim }
+             }
+        }
         default:   {}
     }
 
@@ -36,34 +45,41 @@ 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 }
-                        default:   {}
-                   } }
-        default: {}
-    }
+     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+          "true":  { include apache2 }
+           default: { }
+     }
 
-    case $hostname {
-        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
-                   { include buildd }
-        default:   {}
-    }
-    case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
-    }
-}
+     case extractnodeinfo($nodeinfo, 'buildd') {
+          "true":  { include buildd }
+           default: { }
+     }
+     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+          "true":  { include apache2::security_mirror }
+           default: { }
+     }
+
+
+# maybe wait for rietz to be upgraded to lenny
+#    case $hostname {
+#        rietz,raff,klecker:
+#                   { include named-secondary }
+#        default:   {}
+#    }
 
-node penalosa inherits default {
-    include hosts
+     case $hostname {
+         geo1,geo2,geo3:
+                    { include geodns }
+         default:   {}
+     }
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }