projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Create swapfiles, 2
[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
..
bd14e58
100644
(file)
--- a/
modules/ntp/templates/ntp.conf
+++ b/
modules/ntp/templates/ntp.conf
@@
-6,26
+6,46
@@
driftfile /var/lib/ntp/ntp.drift
statsdir /var/log/ntpstats/
driftfile /var/lib/ntp/ntp.drift
statsdir /var/log/ntpstats/
+# XXX REMOVE wheezy special handling when 670662 gets fixed
+
+<% if %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename')) -%>
statistics loopstats peerstats clockstats
filegen loopstats file loopstats type day enable
filegen peerstats file peerstats type day enable
filegen clockstats file clockstats type day enable
statistics loopstats peerstats clockstats
filegen loopstats file loopstats type day enable
filegen peerstats file peerstats type day enable
filegen clockstats file clockstats type day enable
+<% else -%>
+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 cryptostats file cryptostats type day enable
+<% end -%>
crypto randfile /dev/urandom
keysdir /etc/ntp.keys.d
crypto randfile /dev/urandom
keysdir /etc/ntp.keys.d
-<% if
nodeinfo
['timeserver'] -%>
+<% if
scope.lookupvar('site::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
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" -%>
<% 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
-<% elsif
nodeinfo['misc']['natted']
-%>
+<% elsif
scope.lookupvar('site::nodeinfo')['misc']['natted'] or %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename'))
-%>
# autokey doesn't work behind nat
# 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