X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d8f1b09cbfced976b19ac04c2d4dbb36566bedf8;hb=d3080539839db901b4e766e49fcaf4263026cd2c;hp=28db182df7cf3a1a9c93bc417d1a7962ca3e1bf3;hpb=6223d29ea525ff1ef4626af124280d5f10fea746;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 28db182df..d8f1b09cb 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
 
@@ -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,18 @@ node default {
 #        default:   {}
 #    }
 
-    case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
-    }
-}
-
-node penalosa inherits default {
-    include hosts
+     case $hostname {
+         geo1,geo2,geo3:
+                    {
+                      include geodns
+                      include ntp::server
+                    }
+         default:   {
+                      include ntp::client
+                    }
+     }
+     case $brokenhosts {
+         "true":    { include hosts }
+         default:   {}
+     }
 }