projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
push leap seconds to timeservers
[mirror/dsa-puppet.git]
/
modules
/
ntp
/
templates
/
ntp.conf
diff --git
a/modules/ntp/templates/ntp.conf
b/modules/ntp/templates/ntp.conf
index
549f023
..
9478796
100644
(file)
--- a/
modules/ntp/templates/ntp.conf
+++ b/
modules/ntp/templates/ntp.conf
@@
-19,6
+19,8
@@
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
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
<% end -%>
<% if fqdn == "orff.debian.org" -%>
server ntp.grnet.gr iburst
<% end -%>
@@
-26,6
+28,13
@@
server ntp.grnet.gr iburst
server ntp.ugent.be iburst dynamic
<% elsif nodeinfo['misc']['natted'] -%>
# autokey doesn't work behind nat
server ntp.ugent.be iburst dynamic
<% elsif 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
+# they have a reasonable clock).
+server 86.59.118.147 iburst
+server 194.177.211.209 iburst
+
server merikanto.debian.org iburst
server orff.debian.org iburst
server ravel.debian.org iburst
server merikanto.debian.org iburst
server orff.debian.org iburst
server ravel.debian.org iburst