From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 31 Jan 2012 11:07:01 +0000 (+0100)
Subject: move etc/default/ntpdate to a template
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7316d18dab2a19bd3721b9ac1eed1abb91af758e;p=mirror%2Fdsa-puppet.git

move etc/default/ntpdate to a template
---

diff --git a/modules/ntpdate/files/etc-default-ntpdate b/modules/ntpdate/files/etc-default-ntpdate
deleted file mode 100644
index 4607f647e..000000000
--- a/modules/ntpdate/files/etc-default-ntpdate
+++ /dev/null
@@ -1,21 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-##
-
-# The settings in this file are used by the program ntpdate-debian, but not
-# by the upstream program ntpdate.
-
-# Set to "yes" to take the server list from /etc/ntp.conf, from package ntp,
-# so you only have to keep it in one place.
-NTPDATE_USE_NTP_CONF=no
-
-# List of NTP servers to use  (Separate multiple servers with spaces.)
-# Not used if NTPDATE_USE_NTP_CONF is yes.
-# merikanto	86.59.118.147
-# orff		194.177.211.209
-# ravel		206.12.19.5
-# busoni	140.211.15.34
-NTPSERVERS="86.59.118.147 194.177.211.209 206.12.19.5 140.211.15.34"
-
-# Additional options to pass to ntpdate
-NTPOPTIONS=""
diff --git a/modules/ntpdate/manifests/init.pp b/modules/ntpdate/manifests/init.pp
index 006daa5f8..37de5af58 100644
--- a/modules/ntpdate/manifests/init.pp
+++ b/modules/ntpdate/manifests/init.pp
@@ -10,7 +10,7 @@ class ntpdate {
                     owner   => root,
                     group   => root,
                     mode    => 444,
-                    source  => [ "puppet:///modules/ntpdate/etc-default-ntpdate" ],
+                    content => template("ntpdate/etc-default-ntpdate.erb"),
                     ;
             }
         }
diff --git a/modules/ntpdate/templates/etc-default-ntpdate.erb b/modules/ntpdate/templates/etc-default-ntpdate.erb
new file mode 100644
index 000000000..4607f647e
--- /dev/null
+++ b/modules/ntpdate/templates/etc-default-ntpdate.erb
@@ -0,0 +1,21 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+##
+
+# The settings in this file are used by the program ntpdate-debian, but not
+# by the upstream program ntpdate.
+
+# Set to "yes" to take the server list from /etc/ntp.conf, from package ntp,
+# so you only have to keep it in one place.
+NTPDATE_USE_NTP_CONF=no
+
+# List of NTP servers to use  (Separate multiple servers with spaces.)
+# Not used if NTPDATE_USE_NTP_CONF is yes.
+# merikanto	86.59.118.147
+# orff		194.177.211.209
+# ravel		206.12.19.5
+# busoni	140.211.15.34
+NTPSERVERS="86.59.118.147 194.177.211.209 206.12.19.5 140.211.15.34"
+
+# Additional options to pass to ntpdate
+NTPOPTIONS=""