From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 15 Jun 2019 20:19:09 +0000 (+0200)
Subject: Move timeserver from clementi to manda-node04
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=225f9f1650b942977fc3e9f5a2e3826108d2b43f

Move timeserver from clementi to manda-node04
---

diff --git a/modules/ntp/files/ntpkey_iff_clementi.pub b/modules/ntp/files/ntpkey_iff_clementi.pub
deleted file mode 100644
index 8c584b05b..000000000
--- a/modules/ntp/files/ntpkey_iff_clementi.pub
+++ /dev/null
@@ -1,14 +0,0 @@
-# ntpkey_iffpar_clementi.3580364254
-# Sun Jun 16 09:37:34 2013
-
-# This is the public version of this 'private' key -
-# the private data has been replaced by 0x01.
-# (just ask 'openssl dsa -text < foo.pub')
-
------BEGIN DSA PRIVATE KEY-----
-MIHkAgEAAkEAx9FRuxKTxra+BkeWewzJgjb0O8jq3z3Dd5iBDFHafLXchWejqPOJ
-XQliu1k3VJUnlY6uL+xBP3I/EYGQ4e53FwIVALGJu80wgjNScXQuu/rL8fy0gp91
-AkAqggS+biLemEnBOBKyLoum95EpaLHEgTNvGL7ueWb/SWiUXg+SYHIC0YkP3BkA
-34DgXdmxIVYxj1ElJaz5YinvAkAqggS+biLemEnBOBKyLoum95EpaLHEgTNvGL7u
-eWb/SWiUXg+SYHIC0YkP3BkA34DgXdmxIVYxj1ElJaz5YinvAgEB
------END DSA PRIVATE KEY-----
diff --git a/modules/ntp/files/ntpkey_iff_manda-node04.pub b/modules/ntp/files/ntpkey_iff_manda-node04.pub
new file mode 100644
index 000000000..ff165112b
--- /dev/null
+++ b/modules/ntp/files/ntpkey_iff_manda-node04.pub
@@ -0,0 +1,14 @@
+# ntpkey_iffpar_manda-node04.3763270576
+# Sat Jun 15 20:16:15 2019
+
+# This is the public version of this 'private' key -
+# the private data has been replaced by 0x01.
+# (just ask 'openssl dsa -text < foo.pub')
+
+-----BEGIN DSA PRIVATE KEY-----
+MIHkAgEAAkEAtv6jLPKGDaePtrtRD58D4z48uCgJVzSlAZ264Gl17Nr7z9bdWgWz
+UPDlYtfjZ0UnHLKItf22fV6/OgITv/IH0QIVAPbnnAj2IOuhFRZ5pPTluOf0Ch5/
+AkAwUKHhDGbs073sLMyVYjayy+WE0GCbiZjwbB3AuPz2iIOvG1Gn6C5VRbSKNWwx
+AY6GgZM+qxF7tFssxKjA55VXAkAwUKHhDGbs073sLMyVYjayy+WE0GCbiZjwbB3A
+uPz2iIOvG1Gn6C5VRbSKNWwxAY6GgZM+qxF7tFssxKjA55VXAgEB
+-----END DSA PRIVATE KEY-----
diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index e57e6e224..12c580468 100644
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -4,9 +4,6 @@ class ntp::client {
 		require => Package['ntp'],
 		notify  => Service['ntp']
 	}
-	file { '/etc/ntp.keys.d/ntpkey_iff_clementi':
-		source => 'puppet:///modules/ntp/ntpkey_iff_clementi.pub',
-	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_bm-bl1':
 		source => 'puppet:///modules/ntp/ntpkey_iff_bm-bl1.pub',
 	}
@@ -16,6 +13,12 @@ class ntp::client {
 	file { '/etc/ntp.keys.d/ntpkey_iff_manda-node03':
 		source => 'puppet:///modules/ntp/ntpkey_iff_manda-node03.pub',
 	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_manda-node04':
+		source => 'puppet:///modules/ntp/ntpkey_iff_manda-node04.pub',
+	}
+	file { '/etc/ntp.keys.d/ntpkey_iff_clementi':
+		ensure => absent,
+	}
 	file { '/etc/ntp.keys.d/ntpkey_iff_czerny':
 		ensure => absent,
 	}
diff --git a/modules/ntpdate/manifests/init.pp b/modules/ntpdate/manifests/init.pp
index 74cc23b97..f7a7de632 100644
--- a/modules/ntpdate/manifests/init.pp
+++ b/modules/ntpdate/manifests/init.pp
@@ -9,7 +9,7 @@ class ntpdate {
 		}
 
 		$ntpservers = $::hostname ? {
-			default => ['manda-node03.debian.org', 'clementi.debian.org', 'bm-bl1.debian.org', 'bm-bl2.debian.org']
+			default => ['manda-node03.debian.org', 'manda-node04.debian.org', 'bm-bl1.debian.org', 'bm-bl2.debian.org']
 		}
 
 		file { '/etc/default/ntpdate':