X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=66615d41f461fe29f84943e55c985071d15f7f9b;hb=8b96b94736e59b3cec723fdf95ef5ddcaa6b4a44;hp=fdbde074c959249c2b98c9c3a4575ce811cd1407;hpb=96f778299e93b25a6fe1b158ace05c44f29a4f06;p=dsa-puppet.git

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index fdbde074..66615d41 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