X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=af7c23d9c73b278aac50d85d2f512996f7cd4654;hb=a45da98df2cbd26ba3496cf3e83771a88b3f4fb2;hp=fcf97e889417542402f7dcb4d16fa4cce1f6d5aa;hpb=4a90da07c6b9efbd5cd4d52e31b1ec3925257d5a;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index fcf97e88..af7c23d9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,14 +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 motd
     include samhain
 
@@ -32,8 +33,8 @@ node default {
 
     case $mta {
         "exim4":   {
-             case $nodeinfo['heavy_exim'] {
-                  "true":  { include eximmx }
+             case extractnodeinfo($nodeinfo, 'heavy_exim') {
+                  "true":  { include exim::mx }
                   default: { include exim }
              }
         }
@@ -50,19 +51,20 @@ 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 extractnodeinfo($nodeinfo, 'buildd') {
+          "true":  { include buildd }
+           default: { }
+     }
+     case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+          "true":  { include apache2::security_mirror }
+           default: { }
+     }
 
-    case $hostname {
-        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 {
@@ -71,13 +73,13 @@ node default {
 #        default:   {}
 #    }
 
-    case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
-    }
-}
-
-node penalosa inherits default {
-    include hosts
+     case $hostname {
+         geo1,geo2,geo3:
+                    { include geodns }
+         default:   {}
+     }
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }