X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=d8f1b09cbfced976b19ac04c2d4dbb36566bedf8;hb=547b76eb08936349757a71f00b537af987b86bac;hp=192c5462e066702b7375caa07283f5e04e3fd06d;hpb=bb15adff411f4c08c116324cb21e3f96e767df1b;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 192c5462e..d8f1b09cb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,5 +1,5 @@
 Package {
-    require => [ Exec["apt-get update"], File["/etc/apt/apt.conf.d/local-recommends"] ]
+    require => File["/etc/apt/apt.conf.d/local-recommends"]
 }
 
 File {
@@ -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 }