X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=b8f396b91d4a574f0050bcbdd0a63fb6015ad0f8;hb=61e63cbd8298d10a714106e0566ecd2e21347308;hp=f834f809548ab40e249bdac7549e8a53faab2242;hpb=00284858e6fcbb461e1561d8212a45e73399be60;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f834f8095..b8f396b91 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,13 +14,15 @@ 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 apt-keys
-
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+    include ntp
 
     include motd
     include samhain
@@ -32,8 +34,8 @@ node default {
 
     case $mta {
         "exim4":   {
-             case $hostname {
-                  powell:  { include exim::mx }
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
                   default: { include exim }
              }
         }
@@ -50,34 +52,38 @@ node default {
 	}
     }
 
-    case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
-                        default:   {}
-                   } }
-        default: {}
-    }
+     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+          "true":  { include apache2 }
+           default: { }
+     }
 
-    case $hostname {
-        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
-                   { include buildd }
-        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:   {}
-#    }
 
+# maybe wait for rietz to be upgraded to lenny
     case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
+        rietz,raff,klecker:
+                   { include named::secondary }
         default:   {}
     }
-}
 
-node penalosa inherits default {
-    include hosts
+     case $hostname {
+         geo1,geo2,geo3:
+                    {
+                      include named::geodns
+                    }
+         default:   {
+                    }
+     }
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }