rename BM pejacevic volumes to OLD-

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

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 4fc219f..c5e9fc8 100644 (file)
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -15,46 +15,35 @@ filegen cryptostats file cryptostats type day enable
 crypto randfile /dev/urandom
 keysdir /etc/ntp.keys.d
 
 crypto randfile /dev/urandom
 keysdir /etc/ntp.keys.d
 

-<% if scope.lookupvar('site::nodeinfo')['timeserver'] -%>
+<% 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
 

-<% if @lsbmajdistrelease >= '8' -%>

 leapfile /usr/share/zoneinfo/leap-seconds.list
 leapfile /usr/share/zoneinfo/leap-seconds.list

-<% else -%>
-leapfile /var/lib/ntp/leap-seconds.list
-<% end -%>
-<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
+<% elsif scope.lookupvar('deprecated::nodeinfo')['misc']['natted'] -%>

 # autokey doesn't work behind nat
 
 # autokey doesn't work behind nat
 

-# czerny's, bm-bl2's, and ubc-bl2's ipv4 IP, hard coded for the benefit of
+# 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).
 # 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.109        iburst
-server 5.153.231.242        iburst
-server 206.12.19.212        iburst
+server 82.195.75.69               iburst
+server 5.153.231.242              iburst

 
 

-server czerny.debian.org    iburst
-server clementi.debian.org  iburst
-server bm-bl1.debian.org    iburst
-server bm-bl2.debian.org    iburst
-server ubc-bl2.debian.org   iburst
-server ubc-bl6.debian.org   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 -%>
 <% else -%>

-server czerny.debian.org       iburst autokey
-server clementi.debian.org     iburst autokey
-server bm-bl1.debian.org       iburst autokey
-server bm-bl2.debian.org       iburst autokey
-server ubc-bl2.debian.org      iburst autokey
-server ubc-bl6.debian.org      iburst autokey
-restrict czerny.debian.org     notrust nomodify notrap ntpport
-restrict clementi.debian.org   notrust nomodify notrap ntpport
-restrict bm-bl1.debian.org     notrust nomodify notrap ntpport
-restrict bm-bl2.debian.org     notrust nomodify notrap ntpport
-restrict ubc-bl2.debian.org    notrust nomodify notrap ntpport
-restrict ubc-bl6.debian.org    notrust nomodify notrap ntpport
+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