Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / ntp / templates / ntp.conf

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index c7790ac..c5e9fc8 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -6,27 +6,44 @@
 driftfile /var/lib/ntp/ntp.drift
 statsdir /var/log/ntpstats/
 
 driftfile /var/lib/ntp/ntp.drift
 statsdir /var/log/ntpstats/
 

-statistics loopstats peerstats clockstats
+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 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

 
 

-<% case fqdn
-       when /geo[123].debian.org/:
--%>
+crypto randfile /dev/urandom
+keysdir /etc/ntp.keys.d
+
+<% if scope.lookupvar('deprecated::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

-<%     when "ancina.debian.org": -%>
-server ntp.ugent.be iburst dynamic
-<%     when /(widor|argento).debian.org/: -%>
-server 195.49.152.213 iburst
-server 195.49.152.37 iburst
-<%     else -%>
-server geo1.debian.org iburst dynamic
-server geo2.debian.org iburst dynamic
-server geo3.debian.org iburst dynamic
+
+leapfile /usr/share/zoneinfo/leap-seconds.list
+<% elsif scope.lookupvar('deprecated::nodeinfo')['misc']['natted'] -%>
+# autokey doesn't work behind nat
+
+# manda-node03's, and bm-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.69               iburst
+server 5.153.231.242              iburst
+
+server manda-node03.debian.org    iburst
+server manda-node04.debian.org    iburst
+server bm-bl1.debian.org          iburst
+server bm-bl2.debian.org          iburst
+<% else -%>
+server manda-node03.debian.org    iburst autokey
+server manda-node04.debian.org    iburst autokey
+server bm-bl1.debian.org          iburst autokey
+server bm-bl2.debian.org          iburst autokey
+restrict manda-node03.debian.org  notrust nomodify notrap ntpport
+restrict manda-node04.debian.org  notrust nomodify notrap ntpport
+restrict bm-bl1.debian.org        notrust nomodify notrap ntpport
+restrict bm-bl2.debian.org        notrust nomodify notrap ntpport

 <% end -%>
 
 restrict -4 default kod notrap nomodify nopeer noquery
 <% end -%>
 
 restrict -4 default kod notrap nomodify nopeer noquery


@@ -34,3 +51,7 @@ restrict -6 default kod notrap nomodify nopeer noquery
 
 restrict 127.0.0.1
 restrict ::1
 
 restrict 127.0.0.1
 restrict ::1

+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: