X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d8f1b09cbfced976b19ac04c2d4dbb36566bedf8;hb=3c98a9a0b0ae947e6864b98cc70ddf77b637da26;hp=953000e6636b7dc4a3c87c9d68b37325aee80869;hpb=4f92736eaa93b8637fc100c03ec6a7b52a01ebb1;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 953000e66..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
 
@@ -59,6 +60,11 @@ node default {
           "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 {
@@ -69,11 +75,16 @@ node default {
 
      case $hostname {
          geo1,geo2,geo3:
-                    { include geodns }
+                    {
+                      include geodns
+                      include ntp::server
+                    }
+         default:   {
+                      include ntp::client
+                    }
+     }
+     case $brokenhosts {
+         "true":    { include hosts }
          default:   {}
      }
 }
-
-node penalosa inherits default {
-    include hosts
-}