X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=b8f396b91d4a574f0050bcbdd0a63fb6015ad0f8;hb=77b092ac8ea179f08fa7cb3799c76753d52f8af0;hp=a88b72801741dd7e9ca4536291f7edf700094ca8;hpb=50acf936d799c9b11fc7548a27d20864eccdaf5a;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a88b72801..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
@@ -59,18 +61,26 @@ 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 {
-#        rietz,raff,klecker:
-#                   { include named-secondary }
-#        default:   {}
-#    }
+    case $hostname {
+        rietz,raff,klecker:
+                   { include named::secondary }
+        default:   {}
+    }
 
      case $hostname {
          geo1,geo2,geo3:
-                    { include geodns }
-         default:   {}
+                    {
+                      include named::geodns
+                    }
+         default:   {
+                    }
      }
      case $brokenhosts {
          "true":    { include hosts }