From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 May 2012 13:22:27 +0000 (+0200)
Subject: Make a note to remove special wheezy config once #670662 is fixed
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8b96b94736e59b3cec723fdf95ef5ddcaa6b4a44;p=mirror%2Fdsa-puppet.git

Make a note to remove special wheezy config once #670662 is fixed
---

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