not my day

[mirror/dsa-puppet.git] / modules / ntp / templates / ntp.conf

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 4672a85..bd14e58 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -6,7 +6,9 @@
 driftfile /var/lib/ntp/ntp.drift
 statsdir /var/log/ntpstats/
 
 driftfile /var/lib/ntp/ntp.drift
 statsdir /var/log/ntpstats/
 

-<% if scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
+# 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
 filegen peerstats file peerstats type day enable
 statistics loopstats peerstats clockstats
 filegen loopstats file loopstats type day enable
 filegen peerstats file peerstats type day enable


@@ -35,7 +37,7 @@ server chronos.duth.gr iburst
 <%   end -%>
 <% elsif fqdn == "ancina.debian.org" -%>
 server ntp.ugent.be iburst dynamic
 <%   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 %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
 # autokey doesn't work behind nat
 
 # merikanto's and orff's ipv4 IP, hard coded for the benefit of hosts