X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fntp%2Ftemplates%2Fntp.conf;h=c5e9fc88e23dab5d0287a6d9ffbbf7307bff0cbd;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=462f8056066757114cb2ecd9012b1b5adcd1b663;hpb=0995f61efc833223be6bc85d4e660ce8c0f6eecf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index 462f80560..c5e9fc88e 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -15,14 +15,14 @@ filegen cryptostats file cryptostats type day enable
 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
 
 leapfile /usr/share/zoneinfo/leap-seconds.list
-<% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
+<% 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
@@ -32,16 +32,16 @@ server 82.195.75.69               iburst
 server 5.153.231.242              iburst
 
 server manda-node03.debian.org    iburst
-server clementi.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 clementi.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 clementi.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 -%>