From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 27 Aug 2017 14:15:37 +0000 (+0200)
Subject: ubc-bl[26] are down -- no longer use them as NTP servers
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3713a6a91da6b6854318b1056152019878e09a51;p=mirror%2Fdsa-puppet.git

ubc-bl[26] are down -- no longer use them as NTP servers
---

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index d36b5d49a..9cee0619b 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -17,10 +17,10 @@ class ntp::client {
 		source => 'puppet:///modules/ntp/ntpkey_iff_bm-bl2.pub',
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_ubc-bl2':
-		source => 'puppet:///modules/ntp/ntpkey_iff_ubc-bl2.pub',
+		ensure => absent,
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_ubc-bl6':
-		source => 'puppet:///modules/ntp/ntpkey_iff_ubc-bl6.pub',
+		ensure => absent,
 	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_dijkstra':
 		ensure => absent,
diff --git a/modules/ntp/templates/ntp.conf b/modules/ntp/templates/ntp.conf
index ea9c506e3..406d2f6d4 100644
--- a/modules/ntp/templates/ntp.conf
+++ b/modules/ntp/templates/ntp.conf
@@ -25,32 +25,25 @@ leapfile /usr/share/zoneinfo/leap-seconds.list
 <% elsif scope.lookupvar('site::nodeinfo')['misc']['natted'] -%>
 # autokey doesn't work behind nat
 
-# czerny's, bm-bl2's, and ubc-bl2's ipv4 IP, hard coded for the benefit of
+# czerny'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.109        iburst
 server 5.153.231.242        iburst
-server 206.12.19.212        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
 <% 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
 <% end -%>
 
 restrict -4 default kod notrap nomodify nopeer noquery