From 5fd66d38ed79bb42c64ff68f26a43e71207476ef Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Tue, 9 Jul 2013 16:59:43 -0400 Subject: Add panic as a new parameter in case people want to allow clock skews. --- templates/ntp.conf.archlinux.erb | 6 ++++++ templates/ntp.conf.debian.erb | 2 +- templates/ntp.conf.el.erb | 2 +- templates/ntp.conf.freebsd.erb | 5 ++--- templates/ntp.conf.gentoo.erb | 5 +++++ templates/ntp.conf.suse.erb | 6 +++--- 6 files changed, 18 insertions(+), 8 deletions(-) (limited to 'templates') diff --git a/templates/ntp.conf.archlinux.erb b/templates/ntp.conf.archlinux.erb index 22395d9..ef3b725 100644 --- a/templates/ntp.conf.archlinux.erb +++ b/templates/ntp.conf.archlinux.erb @@ -4,6 +4,12 @@ # - the ntp.conf man page # - http://support.ntp.org/bin/view/Support/GettingStarted # - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon +# +<% if @panic == false -%> +# Keep ntpd from panicking in the event of a large clock skew +# # when a VM guest is suspended and resumed. +tinker panic 0 +<% end -%> # Associate to public NTP pool servers; see http://www.pool.ntp.org/ <% [@servers].flatten.each do |server| -%> diff --git a/templates/ntp.conf.debian.erb b/templates/ntp.conf.debian.erb index 7225fad..324b91c 100644 --- a/templates/ntp.conf.debian.erb +++ b/templates/ntp.conf.debian.erb @@ -1,6 +1,6 @@ # /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help -<% if @is_virtual == "true" -%> +<% if @panic == false -%> # Keep ntpd from panicking in the event of a large clock skew # when a VM guest is suspended and resumed. tinker panic 0 diff --git a/templates/ntp.conf.el.erb b/templates/ntp.conf.el.erb index 4e90569..157b28d 100644 --- a/templates/ntp.conf.el.erb +++ b/templates/ntp.conf.el.erb @@ -1,4 +1,4 @@ -<% if @is_virtual == "true" -%> +<% if @panic == false -%> # Keep ntpd from panicking in the event of a large clock skew # when a VM guest is suspended and resumed. tinker panic 0 diff --git a/templates/ntp.conf.freebsd.erb b/templates/ntp.conf.freebsd.erb index a55ba3d..7fcffb8 100644 --- a/templates/ntp.conf.freebsd.erb +++ b/templates/ntp.conf.freebsd.erb @@ -18,13 +18,12 @@ # The option `maxpoll 9' is used to prevent PLL/FLL flipping on FreeBSD. # # Managed by puppet class { "ntp": servers => [ ... ] } -<% if @is_virtual == "true" -%> - +<% if @panic == false -%> # Keep ntpd from panicking in the event of a large clock skew # when a VM guest is suspended and resumed. tinker panic 0 - <% end -%> + <% [@servers].flatten.each do |server| -%> server <%= server %> <% end -%> diff --git a/templates/ntp.conf.gentoo.erb b/templates/ntp.conf.gentoo.erb index 7b00b46..c22026a 100644 --- a/templates/ntp.conf.gentoo.erb +++ b/templates/ntp.conf.gentoo.erb @@ -6,6 +6,11 @@ # Name of the servers ntpd should sync with # Please respect the access policy as stated by the responsible person. #server ntp.example.tld iburst +<% if @panic == false -%> +# Keep ntpd from panicking in the event of a large clock skew +# # when a VM guest is suspended and resumed. +tinker panic 0 +<% end -%> # Managed by puppet class { "ntp": servers => [ ... ] } <% [@servers].flatten.each do |server| -%> diff --git a/templates/ntp.conf.suse.erb b/templates/ntp.conf.suse.erb index e44e068..1cbe6a2 100644 --- a/templates/ntp.conf.suse.erb +++ b/templates/ntp.conf.suse.erb @@ -29,21 +29,21 @@ ## # server 127.127.8.0 mode 5 prefer -<% if @is_virtual == "false" -%> +<% if @panic == true -%> ## ## Undisciplined Local Clock. This is a fake driver intended for backup ## and when no outside source of synchronized time is available. ## server 127.127.1.0 # local clock (LCL) fudge 127.127.1.0 stratum 10 # LCL is unsynchronized - <% end -%> + # Managed by puppet class { "ntp": servers => [ ... ] } <% [@servers].flatten.each do |server| -%> server <%= server %> <% end -%> -<% if @is_virtual == "true" -%> +<% if @panic == false -%> # Keep ntpd from panicking in the event of a large clock skew # when a VM guest is suspended and resumed. tinker panic 0 -- cgit v1.2.3