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

diff --git a/manifests/site.pp b/manifests/site.pp
index af7c23d9c..b8dabd44d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -15,6 +15,7 @@ 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
@@ -22,6 +23,7 @@ node default {
     include debian-org
     include monit
     include apt-keys
+    include ntp
 
     include motd
     include samhain
@@ -67,16 +69,19 @@ node 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 }