From b7c8611cf8ea27fea00d2678b65c42401782cafd Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Wed, 21 Oct 2009 08:47:25 +0100
Subject: [PATCH] Move to our standard idiom of per-host files.  You wouldn't
 think ntp would be difficult .... Signed-off-by: Stephen Gran
 <steve@lobefin.net>

---
 modules/ntp/files/{ => common}/client.conf    |  0
 modules/ntp/files/{ => common}/server.conf    |  0
 .../per-host/ancina.debian.org/client.conf    | 19 +++++++++++++++++++
 modules/ntp/manifests/client.pp               |  3 ++-
 modules/ntp/manifests/server.pp               |  3 ++-
 5 files changed, 23 insertions(+), 2 deletions(-)
 rename modules/ntp/files/{ => common}/client.conf (100%)
 rename modules/ntp/files/{ => common}/server.conf (100%)
 create mode 100644 modules/ntp/files/per-host/ancina.debian.org/client.conf

diff --git a/modules/ntp/files/client.conf b/modules/ntp/files/common/client.conf
similarity index 100%
rename from modules/ntp/files/client.conf
rename to modules/ntp/files/common/client.conf
diff --git a/modules/ntp/files/server.conf b/modules/ntp/files/common/server.conf
similarity index 100%
rename from modules/ntp/files/server.conf
rename to modules/ntp/files/common/server.conf
diff --git a/modules/ntp/files/per-host/ancina.debian.org/client.conf b/modules/ntp/files/per-host/ancina.debian.org/client.conf
new file mode 100644
index 00000000..486e0872
--- /dev/null
+++ b/modules/ntp/files/per-host/ancina.debian.org/client.conf
@@ -0,0 +1,19 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+driftfile /var/lib/ntp/ntp.drift
+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
+server ntp.ugent.be iburst dynamic
+
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+restrict 127.0.0.1
+restrict ::1
diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index c30316c7..0882e49d 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -3,7 +3,8 @@ class ntp::client inherits ntp {
 		owner   => root,
 		group   => root,
 		mode    => 444,
-		source  => [ "puppet:///ntp/client.conf" ],
+		source  => [ "puppet:///ntp/per-host/$fqdn/client.conf",
+		             "puppet:///ntp/common/client.conf" ],
 		notify  => Exec["ntp restart"],
 		require => Package["ntp"]
 		;
diff --git a/modules/ntp/manifests/server.pp b/modules/ntp/manifests/server.pp
index ded54e72..ab250f6d 100644
--- a/modules/ntp/manifests/server.pp
+++ b/modules/ntp/manifests/server.pp
@@ -3,7 +3,8 @@ class ntp::server inherits ntp {
 		owner   => root,
 		group   => root,
 		mode    => 444,
-		source  => [ "puppet:///ntp/server.conf" ],
+		source  => [ "puppet:///ntp/per-host/$fqdn/server.conf",
+		             "puppet:///ntp/common/server.conf" ],
 		notify  => Exec["ntp restart"],
 		require => Package["ntp"]
 		;
-- 
2.39.2