another ntp cleanup

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

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index bd14e5894cd998aa547fd13a8c8ae039131989e9..fea3e66ffd5481a3561e9f31603646f8549d0a8d 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -6,20 +6,11 @@
 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
-filegen peerstats file peerstats type day enable
-filegen clockstats file clockstats type day enable
-<% else -%>
 statistics loopstats peerstats clockstats cryptostats
 filegen loopstats file loopstats type day enable
 filegen peerstats file peerstats type day enable
 filegen clockstats file clockstats type day enable
 filegen cryptostats file cryptostats type day enable
-<% end -%>
 
 crypto randfile /dev/urandom
 keysdir /etc/ntp.keys.d
@@ -37,7 +28,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'] or %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename')) -%>
+<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
 # autokey doesn't work behind nat
 
 # merikanto's and orff's ipv4 IP, hard coded for the benefit of hosts