projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
96f7782
)
Make a note to remove special wheezy config once #670662 is fixed
author
Peter Palfrader
<peter@palfrader.org>
Sat, 5 May 2012 13:22:27 +0000
(15:22 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Sat, 5 May 2012 13:22:27 +0000
(15:22 +0200)
modules/ntp/templates/ntp.conf
patch
|
blob
|
history
diff --git
a/modules/ntp/templates/ntp.conf
b/modules/ntp/templates/ntp.conf
index
fdbde07
..
66615d4
100644
(file)
--- a/
modules/ntp/templates/ntp.conf
+++ b/
modules/ntp/templates/ntp.conf
@@
-6,6
+6,8
@@
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
<% if %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename')) -%>
statistics loopstats peerstats clockstats
filegen loopstats file loopstats type day enable
@@
-35,7
+37,7
@@
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 scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
+<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted']
or if %w{wheezy}.include?(scope.lookupvar('::lsbdistcodename'))
-%>
# autokey doesn't work behind nat
# merikanto's and orff's ipv4 IP, hard coded for the benefit of hosts
# autokey doesn't work behind nat
# merikanto's and orff's ipv4 IP, hard coded for the benefit of hosts