get rid of obvious changes

[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..11c5c3c 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -14,18 +14,27 @@ filegen clockstats file clockstats type day enable
 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" -%>
 server ntp.grnet.gr iburst
 <%   end -%>
 <% elsif fqdn == "ancina.debian.org" -%>
 server ntp.ugent.be iburst dynamic
 <%   if fqdn == "orff.debian.org" -%>
 server ntp.grnet.gr iburst
 <%   end -%>
 <% elsif fqdn == "ancina.debian.org" -%>
 server ntp.ugent.be iburst dynamic

-<% elsif nodeinfo['misc']['natted'] -%>
+<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>

 # 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