Try to avoid reserved site keyword

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

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index fea3e66..c5e9fc8 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -15,41 +15,35 @@ filegen cryptostats file cryptostats type day enable
 crypto randfile /dev/urandom
 keysdir /etc/ntp.keys.d
 
-<% if scope.lookupvar('site::nodeinfo')['timeserver'] -%>
+<% if scope.lookupvar('deprecated::nodeinfo')['timeserver'] -%>
 server 0.debian.pool.ntp.org iburst dynamic
 server 1.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 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'] -%>
+leapfile /usr/share/zoneinfo/leap-seconds.list
+<% elsif scope.lookupvar('deprecated::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
+# manda-node03'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).
-server 86.59.118.147        iburst
-server 194.177.211.209      iburst
+server 82.195.75.69               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 manda-node03.debian.org    iburst
+server manda-node04.debian.org    iburst
+server bm-bl1.debian.org          iburst
+server bm-bl2.debian.org          iburst
 <% 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 manda-node03.debian.org    iburst autokey
+server manda-node04.debian.org    iburst autokey
+server bm-bl1.debian.org          iburst autokey
+server bm-bl2.debian.org          iburst autokey
+restrict manda-node03.debian.org  notrust nomodify notrap ntpport
+restrict manda-node04.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