projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ship debtags key
[mirror/dsa-puppet.git]
/
modules
/
ntp
/
templates
/
ntp.conf
diff --git
a/modules/ntp/templates/ntp.conf
b/modules/ntp/templates/ntp.conf
index
8cc742a
..
4fc219f
100644
(file)
--- a/
modules/ntp/templates/ntp.conf
+++ b/
modules/ntp/templates/ntp.conf
@@
-21,42
+21,40
@@
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
+<% if @lsbmajdistrelease >= '8' -%>
+leapfile /usr/share/zoneinfo/leap-seconds.list
+<% else -%>
leapfile /var/lib/ntp/leap-seconds.list
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
+<% end -%>
<% 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
-# czerny's, bm-bl2's, and
dijkstra
's ipv4 IP, hard coded for the benefit of
+# czerny's, bm-bl2's, and
ubc-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 82.195.75.109 iburst
server 5.153.231.242 iburst
# hosts that do not have RTC's (since they won't be able to do DNS until
# they have a reasonable clock).
server 82.195.75.109 iburst
server 5.153.231.242 iburst
-server 206.12.19.21
8
iburst
+server 206.12.19.21
2
iburst
server czerny.debian.org iburst
server clementi.debian.org iburst
server bm-bl1.debian.org iburst
server bm-bl2.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
-server
dijkstra.debian.org
iburst
-server
luchesi
.debian.org iburst
+server
ubc-bl2.debian.org
iburst
+server
ubc-bl6
.debian.org iburst
<% else -%>
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
<% else -%>
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
-server
dijkstra.debian.org
iburst autokey
-server
luchesi
.debian.org iburst autokey
+server
ubc-bl2.debian.org
iburst autokey
+server
ubc-bl6
.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
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
-restrict
dijkstra.debian.org
notrust nomodify notrap ntpport
-restrict
luchesi
.debian.org notrust nomodify notrap ntpport
+restrict
ubc-bl2.debian.org
notrust nomodify notrap ntpport
+restrict
ubc-bl6
.debian.org notrust nomodify notrap ntpport
<% end -%>
restrict -4 default kod notrap nomodify nopeer noquery
<% end -%>
restrict -4 default kod notrap nomodify nopeer noquery