summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Coleman <ryan@puppetlabs.com>2012-12-10 11:16:08 -0800
committerRyan Coleman <ryan@puppetlabs.com>2012-12-10 11:16:08 -0800
commitef34330e6fdd3dd430b809089b552fb4e12486ea (patch)
tree9a808b7820388cfa014958c287fdb4721f346336
parent621ed4d3d3cd1896dc649ede9324799bbba07e7f (diff)
parent13835e152e9bc93d2d48a4809aa39dbf8f492946 (diff)
Merge pull request #34 from hunner/add_restrict
Add restrict parameter
-rw-r--r--manifests/init.pp7
-rw-r--r--templates/ntp.conf.debian.erb2
-rw-r--r--templates/ntp.conf.el.erb2
3 files changed, 11 insertions, 0 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 74dcc5f..d23f4a3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -18,6 +18,12 @@
# '2.debian.pool.ntp.org iburst',
# '3.debian.pool.ntp.org iburst', ]
#
+# $restrict = true
+# Whether to restrict ntp daemons from allowing others to use as a server.
+#
+# $autoupdate = false
+# Whether to update the ntp package automatically or not.
+#
# Actions:
#
# Installs, configures, and manages the ntp service.
@@ -34,6 +40,7 @@
# [Remember: No empty lines between comments and class definition]
class ntp($servers='UNSET',
$ensure='running',
+ $restrict=true,
$autoupdate=false
) {
diff --git a/templates/ntp.conf.debian.erb b/templates/ntp.conf.debian.erb
index 7a3f690..5d966f8 100644
--- a/templates/ntp.conf.debian.erb
+++ b/templates/ntp.conf.debian.erb
@@ -30,6 +30,7 @@ filegen clockstats file clockstats type day enable
server <%= server %>
<% end -%>
+<% if @restrict -%>
# Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
# details. The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>
# might also be helpful.
@@ -50,6 +51,7 @@ restrict ::1
# cryptographically authenticated.
#restrict 192.168.123.0 mask 255.255.255.0 notrust
+<% end -%>
# If you want to provide time to your local subnet, change the next line.
# (Again, the address is an example only.)
diff --git a/templates/ntp.conf.el.erb b/templates/ntp.conf.el.erb
index fe8a9a5..80b358b 100644
--- a/templates/ntp.conf.el.erb
+++ b/templates/ntp.conf.el.erb
@@ -4,6 +4,7 @@
tinker panic 0
<% end -%>
+<% if @restrict -%>
# Permit time synchronization with our time source, but do not
# permit the source to query or modify the service on this system.
restrict default kod nomodify notrap nopeer noquery
@@ -18,6 +19,7 @@ restrict -6 ::1
# Hosts on local network are less restricted.
#restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap
+<% end -%>
# Use public servers from the pool.ntp.org project.
# Please consider joining the pool (http://www.pool.ntp.org/join.html).