ubc-bl[26] are down -- no longer use them as NTP servers

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

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 11c5c3c..406d2f6 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


@@ -20,34 +21,29 @@ server 1.debian.pool.ntp.org iburst dynamic
 server 2.debian.pool.ntp.org iburst dynamic
 server 3.debian.pool.ntp.org iburst dynamic
 
 server 2.debian.pool.ntp.org iburst dynamic
 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
-<%   end -%>
-<% elsif fqdn == "ancina.debian.org" -%>
-server ntp.ugent.be iburst dynamic
+leapfile /usr/share/zoneinfo/leap-seconds.list

 <% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
 # autokey doesn't work behind nat
 
 <% 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
-# that do not have RTC's (since they won't be able to do DNS until
+# czerny's, and bm-bl2's ipv4 IP, hard coded for the benefit of
+# hosts that do not have RTC's (since they won't be able to do DNS until

 # they have a reasonable clock).
 # they have a reasonable clock).

-server 86.59.118.147        iburst
-server 194.177.211.209      iburst
+server 82.195.75.109        iburst
+server 5.153.231.242        iburst

 
 

-server merikanto.debian.org iburst
-server orff.debian.org      iburst
-server ravel.debian.org     iburst
-server busoni.debian.org    iburst
+server czerny.debian.org    iburst
+server clementi.debian.org  iburst
+server bm-bl1.debian.org    iburst
+server bm-bl2.debian.org    iburst

 <% else -%>
 <% else -%>

-server merikanto.debian.org iburst autokey
-server orff.debian.org      iburst autokey
-server ravel.debian.org     iburst autokey
-server busoni.debian.org    iburst autokey
-restrict merikanto.debian.org notrust nomodify notrap ntpport
-restrict orff.debian.org      notrust nomodify notrap ntpport
-restrict ravel.debian.org     notrust nomodify notrap ntpport
-restrict busoni.debian.org    notrust nomodify notrap ntpport
+server czerny.debian.org       iburst autokey
+server clementi.debian.org     iburst autokey
+server bm-bl1.debian.org       iburst autokey
+server bm-bl2.debian.org       iburst autokey
+restrict czerny.debian.org     notrust nomodify notrap ntpport
+restrict clementi.debian.org   notrust nomodify notrap ntpport
+restrict bm-bl1.debian.org     notrust nomodify notrap ntpport
+restrict bm-bl2.debian.org     notrust nomodify notrap ntpport

 <% end -%>
 
 restrict -4 default kod notrap nomodify nopeer noquery
 <% end -%>
 
 restrict -4 default kod notrap nomodify nopeer noquery