remove hack for pasquini/tristano; fix orff server list; add cryptostats

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 0febb35..fea3e66 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -6,10 +6,11 @@
 driftfile /var/lib/ntp/ntp.drift
 statsdir /var/log/ntpstats/
 
 driftfile /var/lib/ntp/ntp.drift
 statsdir /var/log/ntpstats/
 

-statistics loopstats peerstats clockstats
+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 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

 
 crypto randfile /dev/urandom
 keysdir /etc/ntp.keys.d
 
 crypto randfile /dev/urandom
 keysdir /etc/ntp.keys.d


@@ -22,7 +23,8 @@ server 3.debian.pool.ntp.org iburst dynamic
 
 leapfile /var/lib/ntp/leap-seconds.list
 <%   if fqdn == "orff.debian.org" -%>
 
 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
 <%   end -%>
 <% elsif fqdn == "ancina.debian.org" -%>
 server ntp.ugent.be iburst dynamic


@@ -40,10 +42,6 @@ server orff.debian.org      iburst
 server ravel.debian.org     iburst
 server busoni.debian.org    iburst
 <% else -%>
 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
 server merikanto.debian.org iburst autokey
 server orff.debian.org      iburst autokey
 server ravel.debian.org     iburst autokey