summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitrios Apostolou <dimitrios.apostolou@qt.io>2019-07-03 15:56:08 +0200
committerDimitrios Apostolou <dimitrios.apostolou@qt.io>2019-07-04 10:47:10 +0000
commit1cde8d1097404dba0b1c074150859e5c56c4d50c (patch)
treedfd7a78d291da11a6021a300f30259517f06b1c8
parentebf96f7ff4ee2cfe2bc356c098c1529388707498 (diff)
Promise the new certificate in puppet
This is already in place on qt-test-server, I'm just promising it in the puppet policy. Fixes: QTQAINFRA-2990 Change-Id: Ib4c0e87d3cc572874b39467a0f991dfaf212a2d3 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--puppet/modules/network_test_server/files/ssl/qt-test-server-cert_2019.pem17
-rw-r--r--puppet/modules/network_test_server/manifests/linux/ssl_certs.pp1
2 files changed, 18 insertions, 0 deletions
diff --git a/puppet/modules/network_test_server/files/ssl/qt-test-server-cert_2019.pem b/puppet/modules/network_test_server/files/ssl/qt-test-server-cert_2019.pem
new file mode 100644
index 0000000..c5aea0d
--- /dev/null
+++ b/puppet/modules/network_test_server/files/ssl/qt-test-server-cert_2019.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICpzCCAhACCQCzAF1hyRVzAjANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
+Tk8xDTALBgNVBAgTBE9zbG8xDTALBgNVBAcTBE9zbG8xDjAMBgNVBAoTBU5va2lh
+MTUwMwYDVQQLFCxRdCBTb2Z0d2FyZS9lbWFpbEFkZHJlc3M9bm9ib2R5QG5vZG9t
+YWluLm9yZzEjMCEGA1UEAxMacXQtdGVzdC1zZXJ2ZXIucXQtdGVzdC1uZXQwHhcN
+MTkwNjI0MTI0OTIxWhcNMjIwNjIzMTI0OTIxWjCBlzELMAkGA1UEBhMCTk8xDTAL
+BgNVBAgTBE9zbG8xDTALBgNVBAcTBE9zbG8xDjAMBgNVBAoTBU5va2lhMTUwMwYD
+VQQLFCxRdCBTb2Z0d2FyZS9lbWFpbEFkZHJlc3M9bm9ib2R5QG5vZG9tYWluLm9y
+ZzEjMCEGA1UEAxMacXQtdGVzdC1zZXJ2ZXIucXQtdGVzdC1uZXQwgZ8wDQYJKoZI
+hvcNAQEBBQADgY0AMIGJAoGBAM2q22/WNMmn8cC+5EEYGeICySLmp9W6Ay6eKHr0
+Xxp3X3epETuPfvAuxp7rOtkS18EMUegkUj8jw0IMEcbyHKFC/rTCaYOt93CxGBXM
+IChiMPAsFeYzGa/D6xzAkfcRaJRQ+Ek3CDLXPnXfo7xpABXezYcPXAJrgsgBfWrw
+HdxzAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEASCKbqEX5ysC549mq90ydk4jyDW3m
+PUyet01fKpcRqVs+OJxdExFBTra3gho6WzzpTSPsuX2ZKOLF5k6KkCvdCGvhC1Kv
+HHPIExurfzvdlSRzj6HbKyPuSfxyOloH0bBp7/Gg5RIuBPKlbmfbnTLtwEjhhbMU
+SoYI8HZd3HfY87c=
+-----END CERTIFICATE-----
diff --git a/puppet/modules/network_test_server/manifests/linux/ssl_certs.pp b/puppet/modules/network_test_server/manifests/linux/ssl_certs.pp
index 456a54b..2b21c28 100644
--- a/puppet/modules/network_test_server/manifests/linux/ssl_certs.pp
+++ b/puppet/modules/network_test_server/manifests/linux/ssl_certs.pp
@@ -13,6 +13,7 @@ class network_test_server::linux::ssl_certs {
ssl_file {
"qt-test-server-cert.pem": ensure => present;
+ "qt-test-server-cert_2019.pem": ensure => present;
"private/qt-test-server-key.pem": ensure => present;
}
}