X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=bd14e5894cd998aa547fd13a8c8ae039131989e9;hb=320758f7417e40be264dab0c3970c185f9ff6a93;hp=0febb359ee1fdeb0737a58f16c62cb399f5d2e0d;hpb=4793b80336b23461510aef7b6126c73e8dffd05d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 0febb359e..bd14e5894 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -6,10 +6,20 @@
 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
@@ -22,11 +32,12 @@ server 3.debian.pool.ntp.org iburst dynamic
 
 leapfile /var/lib/ntp/leap-seconds.list
 <%   if fqdn == "orff.debian.org" -%>
-server ntp.grnet.gr iburst
+server ntp.grnet.gr iburst dynamic
+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 %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
@@ -40,10 +51,6 @@ server orff.debian.org      iburst
 server ravel.debian.org     iburst
 server busoni.debian.org    iburst
 <% else -%>
-<%   if %w{pasquini.debian.org tristano.debian.org}.include?(fqdn) -%>
-server ntp1.ubc.ca iburst dynamic
-server ntp2.ubc.ca iburst dynamic
-<%   end -%>
 server merikanto.debian.org iburst autokey
 server orff.debian.org      iburst autokey
 server ravel.debian.org     iburst autokey