X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=b8dabd44d5049e16fe8f1a6c71ed6c529633a4af;hb=00c3a22cc611390e2b4a4cd9647e1edc5d8badae;hp=2e8000b060e8dd2786672563a8868c12e2eb25a8;hpb=f3e377f781db5994054c1969b3639143a92f6a26;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 2e8000b06..b8dabd44d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,13 +14,16 @@ Exec {
 }
 
 node default {
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+    $hoster   = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.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
@@ -55,26 +58,33 @@ node default {
            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 {
-        ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
-                   { include buildd }
+        rietz,raff,klecker:
+                   { include named::secondary }
         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 }
+                    {
+                      include named::geodns
+                    }
+         default:   {
+                    }
+     }
+     case $brokenhosts {
+         "true":    { include hosts }
          default:   {}
      }
 }
-
-node penalosa inherits default {
-    include hosts
-}