Factor out ntpd setup.

puppet/dist/etc/ntp.conf.client

+# /etc/ntp.conf, configuration for ntpd
+
+driftfile /var/lib/ntp/ntp.drift
+
+# Enable this if you want statistics to be logged.
+#statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+
+# You do need to talk to an NTP server or two (or three).
+server stentyst.cederqvist
+
+# By default, exchange time with everybody, but don't allow configuration.
+# See /usr/share/doc/ntp-doc/html/accopt.html for details.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
+# Clients from this (example!) subnet have unlimited access,
+# but only if cryptographically authenticated
+#restrict 192.168.123.0  mask  255.255.255.0 notrust
+
+# If you want to provide time to your local subnet, change the next line.
+# (Again, the address is an example only.)
+#broadcast 192.168.123.255
+
+# If you want to listen to time broadcasts on your local subnet,
+# de-comment the next lines. Please do this only if you trust everybody
+# on the network!
+#disable auth
+#broadcastclient

puppet/master/manifests/classes/ntpd.pp

+class ntpd {
+  package { ["ntp", "ntp-doc"]:
+    ensure => latest,
+  }
+
+  service { ntp:
+    subscribe => [Package["ntp"],
+                  File["/etc/ntp.conf"]],
+    enable    => true,
+    ensure    => running,
+    hasstatus => true,
+  }
+}
+
+class ntpdmaster {
+  file { "/etc/ntp.conf":
+    source => "puppet:///dist/etc/ntp.conf.server",
+    owner => root,
+    group => root,
+    mode => 444,
+  }
+}
+
+class ntpdclient inherits ntpd {
+  file { "/etc/ntp.conf":
+    source => "puppet:///dist/etc/ntp.conf.client",
+    owner => root,
+    group => root,
+    mode => 444,
+  }
+}

puppet/master/manifests/site.pp

@@ -23,6 +23,7 @@ node stentyst {
   include dhcpserver
   include bind9
   include slimserver
+  include ntpdmaster
 
   package { "debconf-doc":
     ensure => latest,
@@ -53,25 +54,6 @@ node stentyst {
     mode => 444,
   }
 
-  package { ["ntp", "ntp-doc"]:
-    ensure => latest,
-  }
-
-  file { "/etc/ntp.conf":
-    source => "puppet:///dist/etc/ntp.conf.server",
-    owner => root,
-    group => root,
-    mode => 444,
-  }
-    
-  service { ntp:
-    subscribe => [Package["ntp"],
-                  File["/etc/ntp.conf"]],
-    enable    => true,
-    ensure    => running,
-    hasstatus => true,
-  }
-
   package { "azureus":
     ensure => latest,
   }