all new time servers

diff --git a/modules/ntp/files/ntpkey_iff_bm-bl1.pub b/modules/ntp/files/ntpkey_iff_bm-bl1.pub
new file mode 100644 (file)
index 0000000..c3fd961
--- /dev/null
+++ b/modules/ntp/files/ntpkey_iff_bm-bl1.pub
@@ -0,0 +1,14 @@
+# ntpkey_iffpar_bm-bl1.3580364370
+# Sun Jun 16 09:39:30 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-----
+MIHkAgEAAkEA3SpKMkuqoFshzu0T8k2VADU8hkcCKNjl046d+Et+t6dhA8Hu7y+R
+5u24Y6cOSD+k1BvSJbSLqw1jheX9gMwKVQIVANwKZ0yiqnZ+NIectDgq68euUlbx
+AkBCnaeHkD+uAKs0E8nh7RYP6xgDBlvHPQOFoBuGhTdRw7CKAXZYiAhgxaZJzMre
+9QLFmvwKDojvP+pSNn6r8lybAkBCnaeHkD+uAKs0E8nh7RYP6xgDBlvHPQOFoBuG
+hTdRw7CKAXZYiAhgxaZJzMre9QLFmvwKDojvP+pSNn6r8lybAgEB
+-----END DSA PRIVATE KEY-----

diff --git a/modules/ntp/files/ntpkey_iff_bm-bl2.pub b/modules/ntp/files/ntpkey_iff_bm-bl2.pub
new file mode 100644 (file)
index 0000000..64b9897
--- /dev/null
+++ b/modules/ntp/files/ntpkey_iff_bm-bl2.pub
@@ -0,0 +1,14 @@
+# ntpkey_iffpar_bm-bl2.3580364417
+# Sun Jun 16 09:40:17 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-----
+MIHmAgEAAkEApzQEYQc9bq8v7ZUfv4o65X5uaaDCUmBKI1+j9udq7I1Ax3hYhEqz
+yYLN2DxMvK3DDWoLYLvmmIjOYGVCqth7EQIVAK3PP6wilByfoyjNuU8VoZIQ6VBf
+AkEAn7un44jimuX9iDYhypYKFMoJ99EpIjX876TEe4Y9fhcYu1Ty9Kj19O4hvgDr
+t576NIs31Qsn9m5ML4ktZX4GWgJBAJ+7p+OI4prl/Yg2IcqWChTKCffRKSI1/O+k
+xHuGPX4XGLtU8vSo9fTuIb4A67ee+jSLN9ULJ/ZuTC+JLWV+BloCAQE=
+-----END DSA PRIVATE KEY-----

diff --git a/modules/ntp/files/ntpkey_iff_busoni.pub b/modules/ntp/files/ntpkey_iff_busoni.pub
deleted file mode 100644 (file)
index d1a8743..0000000
--- a/modules/ntp/files/ntpkey_iff_busoni.pub
+++ /dev/null
@@ -1,18 +0,0 @@
-# ntpkey_IFFkey_busoni.3492505947
-# Fri Sep  3 12:32:27 2010
-
-# 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-----
-MIIBpwIBAAKBgQCnnKFu3iaMXhs1Hs1GapryKEp/PUCdwHPeT1MfOWPJ+93UpZ9g
-vWxo7/GaFOHNoKQJnWOrfUMbtmJcjuc1+RFu+Xfmz5M1XcTM8tvVjMGrivT2nRSL
-32w0KPw423Etlq0tGuvCpreez42BACSW8y0UYXGZaqyC85JWU1Y/GOBIewIVAJTy
-RyGaDKqsMP00xX3pR5uz9TljAoGAIyF2RsHqsN1sKXXYTqG66ufe1kFE7eXeFGbb
-6iwE7IOcnCJMaPidr0d6gYbzR56S8WD3AqZ1HGKuV0825ZuW7xWlpDWgKwSKV9fT
-GuXnN3+zQUQ+9iLn/f77+hMl/QPHtRk3q0r9ZfhN48JCVsOYkUlA4Yf+6I2nZaYk
-jnxL34MCgYB2e7I6Gp0SvTPuxPVkbScxAEEyz2A9UGhdg7p7Niv6D9OMIWh1DMQS
-PDbY/7UESoxRmlKDQK0SXwL3r3IFXTTyHBLLZjT6QaSZiJ7g54JhmSmgBRZVBqop
-Tldvb/h1N/gLOobcX/0nMzPptyoduD4muy3hUPfH7UFwLDXaVmLhRgIBAQ==
------END DSA PRIVATE KEY-----

diff --git a/modules/ntp/files/ntpkey_iff_clementi.pub b/modules/ntp/files/ntpkey_iff_clementi.pub
new file mode 100644 (file)
index 0000000..8c584b0
--- /dev/null
+++ b/modules/ntp/files/ntpkey_iff_clementi.pub
@@ -0,0 +1,14 @@
+# 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_czerny.pub b/modules/ntp/files/ntpkey_iff_czerny.pub
index f7d7f9b18c1ad3ab075a91a465b1313d7f9f9434..2864b3c5ecee7590e561fbaaa6ffb473eeaef222 100644 (file)
--- a/modules/ntp/files/ntpkey_iff_czerny.pub
+++ b/modules/ntp/files/ntpkey_iff_czerny.pub
@@ -1,13 +1,14 @@
-# ntpkey_iffpar_czerny.3580328288
-# Sat Jun 15 23:38:08 2013
+# ntpkey_iffpar_czerny.3580363383
+# Sun Jun 16 09:23:03 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 PRIVATE KEY-----
-MIGzAgEAMIGoBgcqhkjOOAQBMIGcAkEA8roR8u2irXtdrgLHrjTC9RDvRJuDNrbD
-oMt1flSJSmWMW0zrfdYKyXzlOPwvf8YLClaFUQQTIW62ZDbuXPevOQIVAMt9N6tD
-WpLYqJIUxUeNLQSjRL3vAkA916pTvtXTAUERlwdKAI6rErZkPHY9S/F1t7O2TRce
-aOplDgAOVEtp4LCENj0NNpAm3/jFTc1eVsQZK82E9D6fBAMCAQE=
------END PRIVATE KEY-----
+-----BEGIN DSA PRIVATE KEY-----
+MIHkAgEAAkEAm1nhgQ5JMlVOgd/InHfjoo3fitu2BuJkEFZrN6NXVB1mrZS523cb
+nxdujmM6CsQbRKH/V85hxVrbgvKzC7i7LQIVAM1KPTu/thw8w9C8/uZthu3SqWnf
+AkBb6TJy5An0xnrYIXmzqG37p03wQFUsRkFaNxP+a6xupbskIth6WE8gLRhhJHZm
+DTvn/w0yXZ9XHBDpcLlhZ9wHAkBb6TJy5An0xnrYIXmzqG37p03wQFUsRkFaNxP+
+a6xupbskIth6WE8gLRhhJHZmDTvn/w0yXZ9XHBDpcLlhZ9wHAgEB
+-----END DSA PRIVATE KEY-----

diff --git a/modules/ntp/files/ntpkey_iff_dijkstra.pub b/modules/ntp/files/ntpkey_iff_dijkstra.pub
new file mode 100644 (file)
index 0000000..76fe929
--- /dev/null
+++ b/modules/ntp/files/ntpkey_iff_dijkstra.pub
@@ -0,0 +1,14 @@
+# ntpkey_iffpar_dijkstra.3580364529
+# Sun Jun 16 09:42:09 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-----
+MIHkAgEAAkEA7djh3/Ef9jw0LFKdsbbUMpVW2f5wvwTY6ZXF6j7F6DNJ6X0z59D7
+MpzFryJhz22Cq32+zjsksjilA58Xb/MZ2QIVAMTG9WKPzkrq5OJ+cwXhYqQCmFdp
+AkA4HRzCeQCe4g3mWoniNDuKDHyqcZMQL+xXhTSZvG5L6ogvL1xEEE3gCyQ4oOCX
+2bj5dYDUST8tXjp1+W/a9m1FAkA4HRzCeQCe4g3mWoniNDuKDHyqcZMQL+xXhTSZ
+vG5L6ogvL1xEEE3gCyQ4oOCX2bj5dYDUST8tXjp1+W/a9m1FAgEB
+-----END DSA PRIVATE KEY-----

diff --git a/modules/ntp/files/ntpkey_iff_luchesi.pub b/modules/ntp/files/ntpkey_iff_luchesi.pub
new file mode 100644 (file)
index 0000000..253f841
--- /dev/null
+++ b/modules/ntp/files/ntpkey_iff_luchesi.pub
@@ -0,0 +1,14 @@
+# ntpkey_iffpar_luchesi.3580364530
+# Sun Jun 16 09:42:10 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-----
+MIHkAgEAAkEA/idRNPJErBEQ0bUoZwcNOAYkkiRvifcnY+jRJCmnrgM/iZcUDHyP
+ybViXPWC/EZFP6dXeMsyUrGy1Zl8ggziWQIVANReUa/ez8lwC4k3OqNK9yMRIxBb
+AkBorTfNb5mHqO+j7XOMfbLls9ZgZcZmE4zNLtXJt3ymy6mWvnwO6UIN6nuihesw
+IlED9pic+18zTlf6L5MeJY2OAkBorTfNb5mHqO+j7XOMfbLls9ZgZcZmE4zNLtXJ
+t3ymy6mWvnwO6UIN6nuiheswIlED9pic+18zTlf6L5MeJY2OAgEB
+-----END DSA PRIVATE KEY-----

diff --git a/modules/ntp/files/ntpkey_iff_merikanto.pub b/modules/ntp/files/ntpkey_iff_merikanto.pub
deleted file mode 100644 (file)
index ce9a602..0000000
--- a/modules/ntp/files/ntpkey_iff_merikanto.pub
+++ /dev/null
@@ -1,18 +0,0 @@
-# ntpkey_IFFkey_merikanto.3492505905
-# Fri Sep  3 12:31:46 2010
-
-# 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-----
-MIIBpwIBAAKBgQCWWLVyJ6HUVVEqOHxj7Iw+hZGaw+1Lzbugw4AwYIQWy/0PVN1j
-zyAEA+dd5JcOiZ83u83mnljRIof780ZshZo8jx0E4Xf+B/yr+/OKUiaCh+ZhDsXz
-XSvhIDPS/YMpVeDqEiEeQMnHy91IIsdAp+mY28eQ9YrL2WSlv2DZ+qIAiQIVAOQd
-lg0FvFrRL4odQCGOue0wQHKhAoGASb1auh2h+g1dLvSAkw4fUYRq06cBWnmeUC31
-KZOBAnElcg+sYyqkrmZe6U0aSZFt/mWvTk2gdoZVA+ITGfsi4GH5LOc0UHp4AsyH
-e31dpQgzceZHhXj+hPGfKjH2cQunZW+eJlsXBKKY5J2dakA6hPStsT7kpejAsoLm
-mxxffZgCgYA0PJBuVqLgKHKxncCHDC9DPq+dJ8b62hrXFB11Sb7pJs0qWtJpLD1J
-FdaiZeUmBwFRgGosU/Gb44yXBNjIr1IYlaDIE+hxz7xByKj3Vi5wZh7KylW0Em4v
-WefQlojNBsymYoDSKSFw1RX7dPKEaL+Nkuz/NvPhVxBd2EzH5uHmEAIBAQ==
------END DSA PRIVATE KEY-----

diff --git a/modules/ntp/files/ntpkey_iff_orff.pub b/modules/ntp/files/ntpkey_iff_orff.pub
deleted file mode 100644 (file)
index 1953db4..0000000
--- a/modules/ntp/files/ntpkey_iff_orff.pub
+++ /dev/null
@@ -1,18 +0,0 @@
-# ntpkey_IFFkey_orff.3492505946
-# Fri Sep  3 12:32:27 2010
-
-# 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-----
-MIIBpwIBAAKBgQCPMl5UYkQV+TKXIOo4ySk9B6/WOFTbbofkv9zU9BsXZx3dqBL4
-uDorS+8BawWZcaBRvl1FiG31wcDq2/ltCthIqtUqcY8OvStYpdncBNOwWfzI+iQp
-9FWg18xG9qufgkm7GOK0jSPxSg5WkkpbzDVJGtamrcM3dTfl8uD54/yqpwIVAMfA
-kSN8n3ULsmOXZ809hmsMAeuvAoGAbsjJi/trgqnmjzqB3qcPinH2ljzPX9VUCHKp
-7zZlfR3iICKTXUJSLYzoT3IWtPJuLacNpCMr641QOypHYeXhSyF4SXtNf6RTtHKU
-FgWFtrBI0TO6P1oUdUUUYGo4mf90vIA/PgH0XqGupqV5k8tWU1Nkldqkdv1V8DRZ
-/mTooYYCgYBm/1vSho/CA6ObMdCkbWZUefe6oRrOqOUKH6gWSjh4FchD8CpXuPfi
-NLgnWIW3kmvunuRfLofxg1fvyOLLbBsvMt3sP60DX3ZAAmliaoQSmpRhHQJ5MRlW
-N1YhIacmH/E/b0Pt69AEI8y2qaZ/dytdUgqhP3FiIP8xUWmgBKQ3YAIBAQ==
------END DSA PRIVATE KEY-----

diff --git a/modules/ntp/files/ntpkey_iff_ravel.pub b/modules/ntp/files/ntpkey_iff_ravel.pub
deleted file mode 100644 (file)
index e74783d..0000000
--- a/modules/ntp/files/ntpkey_iff_ravel.pub
+++ /dev/null
@@ -1,18 +0,0 @@
-# ntpkey_IFFkey_ravel.3492505946
-# Fri Sep  3 12:32:26 2010
-
-# 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-----
-MIIBpwIBAAKBgQCcDkgB/G7gg7ZMwmfpUNwn56i2bc6OMKEJyPDPB3Y9l70VKC6U
-p6O5sl1S31aSTDANiUwnai0BXWBymiRRzaoSnRKQsHbhWSSUAsvChHMBgh01qlAc
-+DORJUUndgk+G3Pwfh88Xsw4+nnJxhneGskYm0SmAiDKtwZhuo7P7DajWwIVAOCs
-es4iYundrvhIpQNHV0L37lClAoGAfWso0vkpwJUyNxYQ+H/EQscw/WIX7+2DtqRG
-szsdSn3WlcFaI0JAws1EsYwfIENzUf38GDymlr+kxc6Ejzsv4Gxp1bGxGr7WNLbL
-OXxxWRISxfwcvpOqKYlrPn6uMQAT7GYqLRuQAt0BwyqaRVR5hB72Q3OiUqQaEZEf
-KfYGoM8CgYAIC5W2EQGy4fjORmxeE4Dl8GB33FX1BWqiMHMTJkso6FUcD9pudKN9
-gfP0JSriXONUt3Bup0dolgzmSW8/oOMe16l4VtXXctVjt+5UUqfJNfpFyR47NkSC
-/JkHPZVvdZa3eFacf9koBEvz6Fb5K8mhuwSUKqVWBlesBNVexOIJ/QIBAQ==
------END DSA PRIVATE KEY-----

diff --git a/modules/ntp/manifests/client.pp b/modules/ntp/manifests/client.pp
index c6f6fdf3c6828e236dfdc01fd09d6876edeb70f0..d7eb61876fec0e91533dbca735afd2a871766125 100644 (file)
--- a/modules/ntp/manifests/client.pp
+++ b/modules/ntp/manifests/client.pp
@@ -7,16 +7,32 @@ class ntp::client {
        file { '/etc/ntp.keys.d/ntpkey_iff_czerny':
                source => 'puppet:///modules/ntp/ntpkey_iff_czerny.pub',
        }
+       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',
+       }
+       file { '/etc/ntp.keys.d/ntpkey_iff_bm-bl2':
+               source => 'puppet:///modules/ntp/ntpkey_iff_bm-bl2.pub',
+       }
+       file { '/etc/ntp.keys.d/ntpkey_iff_dijkstra':
+               source => 'puppet:///modules/ntp/ntpkey_iff_dijkstra.pub',
+       }
+       file { '/etc/ntp.keys.d/ntpkey_iff_luchesi':
+               source => 'puppet:///modules/ntp/ntpkey_iff_luchesi.pub',
+       }
+
        file { '/etc/ntp.keys.d/ntpkey_iff_merikanto':
-               source => 'puppet:///modules/ntp/ntpkey_iff_merikanto.pub',
+               ensure => absent,
        }
        file { '/etc/ntp.keys.d/ntpkey_iff_orff':
-               source => 'puppet:///modules/ntp/ntpkey_iff_orff.pub',
+               ensure => absent,
        }
        file { '/etc/ntp.keys.d/ntpkey_iff_ravel':
-               source => 'puppet:///modules/ntp/ntpkey_iff_ravel.pub',
+               ensure => absent,
        }
        file { '/etc/ntp.keys.d/ntpkey_iff_busoni':
-               source => 'puppet:///modules/ntp/ntpkey_iff_busoni.pub',
+               ensure => absent,
        }
 }