From 8b96b94736e59b3cec723fdf95ef5ddcaa6b4a44 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 5 May 2012 15:22:27 +0200 Subject: [PATCH] Make a note to remove special wheezy config once #670662 is fixed --- modules/ntp/templates/ntp.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf index fdbde074c..66615d41f 100644 --- a/modules/ntp/templates/ntp.conf +++ b/modules/ntp/templates/ntp.conf @@ -6,6 +6,8 @@ driftfile /var/lib/ntp/ntp.drift statsdir /var/log/ntpstats/ +# XXX REMOVE wheezy special handling when 670662 gets fixed + <% if %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename')) -%> statistics loopstats peerstats clockstats filegen loopstats file loopstats type day enable @@ -35,7 +37,7 @@ server chronos.duth.gr iburst <% end -%> <% elsif fqdn == "ancina.debian.org" -%> server ntp.ugent.be iburst dynamic -<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%> +<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] or if %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename')) -%> # autokey doesn't work behind nat # merikanto's and orff's ipv4 IP, hard coded for the benefit of hosts -- 2.20.1