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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8331d5030..d8f1b09cb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -14,6 +14,8 @@ Exec {
 }
 
 node default {
+    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
     include munin-node
     include sudo
     include ssh
@@ -21,8 +23,6 @@ node default {
     include monit
     include apt-keys
 
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-
     include motd
     include samhain
 
@@ -75,8 +75,13 @@ node default {
 
      case $hostname {
          geo1,geo2,geo3:
-                    { include geodns }
-         default:   {}
+                    {
+                      include geodns
+                      include ntp::server
+                    }
+         default:   {
+                      include ntp::client
+                    }
      }
      case $brokenhosts {
          "true":    { include hosts }