Skip to content

Commit 142e0c2

Browse files
karmikarmi
committed
CI: Update the default certificates
Add "localhost" as a valid hostname to the certificates. Example curl command: $ docker run -it --rm --network elasticsearch --volume $PWD/.jenkins/certs/ca.crt:/ca.crt appropriate/curl --cacert /ca.crt https://elastic:elastic@es1:9200 (cherry picked from commit e9eb76d)
1 parent d7a3491 commit 142e0c2

File tree

6 files changed

+69
-68
lines changed

6 files changed

+69
-68
lines changed

‎.jenkins/certs/ca.crt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIDSTCCAjGgAwIBAgIUIwN+0zglsexRKwE1RGHvlCcmrdwwDQYJKoZIhvcNAQEL
2+
MIIDSTCCAjGgAwIBAgIUGqPn96yNRroRX2uBi+m999M4GwIwDQYJKoZIhvcNAQEL
33
BQAwNDEyMDAGA1UEAxMpRWxhc3RpYyBDZXJ0aWZpY2F0ZSBUb29sIEF1dG9nZW5l
4-
cmF0ZWQgQ0EwHhcNMTkwMjEzMDcyMjQwWhcNMjIwMjEyMDcyMjQwWjA0MTIwMAYD
4+
cmF0ZWQgQ0EwHhcNMjAwNDI5MDUyMzI2WhcNMjEwNDI5MDUyMzI2WjA0MTIwMAYD
55
VQQDEylFbGFzdGljIENlcnRpZmljYXRlIFRvb2wgQXV0b2dlbmVyYXRlZCBDQTCC
6-
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANILs0JO0e7x29zeVx21qalK
7-
XKdX+AMlGJPH75wWO/Jq6YHtxt1wYIg762krOBXfG6JsFSOIwIv5VrzGGRGjSPt9
8-
OXQyXrDDiQvsBT3rpzLNdDs7KMl2tZswwv7w9ujgud0cYnS1MOpn81rfPc73DvMg
9-
xuhplofDx6fn3++PjVRU2FNiIVWyEoaxRjCeGPMBubKZYaYbQA6vYM4Z+ByG727B
10-
AyAER3t7xmvYti/EoO2hv2HQk5zgcj/Oq3AJKhnt8LH8fnfm3TnYNM1htvXqhN05
11-
vsvhvm2PHfnA5qLlSr/3W0aI/U/PqfsFDCgyRV097sMIaKkmavb0Ue7aQ7lgtp0C
12-
AwEAAaNTMFEwHQYDVR0OBBYEFDRKlCMowWR1rwxE0d1lTEQe5O71MB8GA1UdIwQY
13-
MBaAFDRKlCMowWR1rwxE0d1lTEQe5O71MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
14-
hvcNAQELBQADggEBAKbCJ95EBpeuvF70KEt6QU70k/SH1NRvM9YzKryV0D975Jvu
15-
HOSm9HgSTULeAUFZIa4oYyf3QUfVoI+2T/aQrfXA3gfrJWsHURkyNmiHOFAbYHqi
16-
xA6i249G2GTEjc1+le/M2N2CcDKAmurW6vSGK4upXQbPd6KmnhHREX74zkWjnOa+
17-
+tibbSSOCT4Tmja2DbBxAPuivU9IB1g/hIUmbYQqKffQrBJA0658tz6w63a/Q7xN
18-
pCvvbSgiMZ6qcVIcJkBT2IooYie+ax45pQECHthgIUcQAzfmIfqlU0Qfl8rDgAmn
19-
0c1o6HQjKGU2aVGgSRuaaiHaSZjbPIZVS51sOoI=
6+
ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsS6eBX4PK3xiU5+mWG2pj6
7+
T/3GzOkYRmHPqOsIdVylKeqg5p42y8u3UrSk4pqWg7oifwZTJkOQOuoZMoqAE9C1
8+
lwHJfdvyltjg/BAj4+3s3QqxWWMy1ATNXvYYOxhgC5F7URLYKdEKxYjWkZIxChcy
9+
2oEpYSezDb1KnnraDz+snawTUVAqiHgsjmEMqueJZGj78dULf6kgsDRbGVecVy+B
10+
D9aFUgnB0Tb8i2BbU90LwknKqJGmQ0JwMRBWoGXJ/jhOr1bYhx8RUWZVglF/Q6MZ
11+
Es63oW45POm+OLlZk8Lnvzth7DS37v8wPID8cc00Dsb1g2s7ValacesdFn8huyUC
12+
AwEAAaNTMFEwHQYDVR0OBBYEFAoBzyNNN2Uz/J/pQP6o8Mj2OvEWMB8GA1UdIwQY
13+
MBaAFAoBzyNNN2Uz/J/pQP6o8Mj2OvEWMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
14+
hvcNAQELBQADggEBACV43c28cDSpX1FICI37pITRRzw4O9PG/HKrf307/jIieHTb
15+
HPR6W27YZcwaI5Mtut6DkloM6I44uC87zqzCpxnSdmhEzMIcKjQbIBZEItvrJURd
16+
2ll4RcXrAEznbwng9Z90W3WOgWjX91AA6Y/TCYgCxa9/qA99RLvJlU4VkQ6QUE4X
17+
e2nSdBBBTUgARVM+0nDxPvE00GR598UA/UFiXtKJNZv3BNt5viPefFYXItuzlmsQ
18+
7ZkLqGOYcHrH/rdSzS4R2D1WjlzPBx4z5D7+3XQV2mjRJmahKZj8F0icnZPq9Uk2
19+
nehNyMis+kGplpUspadB+HUKt6uaCwR+ELOPyhU=
2020
-----END CERTIFICATE-----

‎.jenkins/certs/elasticsearch.crt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIDWTCCAkGgAwIBAgIVAPoJuUxY401b3h8Rk0FDXBSelZtHMA0GCSqGSIb3DQEB
3+
CwUAMDQxMjAwBgNVBAMTKUVsYXN0aWMgQ2VydGlmaWNhdGUgVG9vbCBBdXRvZ2Vu
4+
ZXJhdGVkIENBMB4XDTIwMDQyOTA1MjMyN1oXDTIxMDQyOTA1MjMyN1owGDEWMBQG
5+
A1UEAxMNZWxhc3RpY3NlYXJjaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
6+
ggEBAK5zkKu8T+b7r1douuv5LAE7+Fy+uGvUG10PNifyxDZPyaj6B0+LA62Im+2A
7+
6Yy9j2lmDgXdho6pOBvjdOtP/b3LTMlWkRW45/iPUeq3QcJBpoeQCZKhqtiYNaFH
8+
ONqSulZcgQWaOuT3Z6JCHNoO4F8Vk5EYrhgd34VGWmJ/faZKOrghB20is23YXEum
9+
jyVsh9hlP8y4RvLstcVBpjIgMcouTRaDHTIvG7est9w6C88CocVM7a0BW8WBTPnh
10+
oMCXvW2VavLb1q5SLaw71ubSifdfCiMGtDlKiCLlBFrFz7Jgy4Sv9ZRP5pIHKaYW
11+
G1hfBmSd0uljDo3CYzg0eh/hr7sCAwEAAaN+MHwwHQYDVR0OBBYEFIi080MqNORc
12+
puFSi6fLV/e/DqUVMB8GA1UdIwQYMBaAFAoBzyNNN2Uz/J/pQP6o8Mj2OvEWMC8G
13+
A1UdEQQoMCaCCWxvY2FsaG9zdIcEfwAAAYcEAAAAAIIDZXMxggNlczKCA2VzMzAJ
14+
BgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAoKXXBi2dnDP2cdPhd859OASl5
15+
PjNpnCrVlUUbQtATUC48yuIdtfpsh1g50Bw5WXZIckM+nebYWE+wOGu4gYgVKgIL
16+
ewbKBTds3GMIIXo3SE41jjOOLmP5Pg5v2/QrxchUd4M2PYwhjs7/9rQ9r4CpaJN0
17+
jm1YkGaJe+lySoD5q029Xy3tcJNur3Ks+TXiGAX5sFJqSpYIwYnsr/h8rRamZYGx
18+
BGuohGZSoiMMHJCJedOyFjg8gGX7cqWt70scbHqb65SXpbZsWwyim3fm64h7fVVq
19+
4IGbNVSm+QLasvqoqw2bjdvwdqgriKVZOqAZJXp43PQxB90cRnBs88pnZfr6
20+
-----END CERTIFICATE-----

‎.jenkins/certs/elasticsearch.key‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEowIBAAKCAQEArnOQq7xP5vuvV2i66/ksATv4XL64a9QbXQ82J/LENk/JqPoH
3+
T4sDrYib7YDpjL2PaWYOBd2Gjqk4G+N060/9vctMyVaRFbjn+I9R6rdBwkGmh5AJ
4+
kqGq2Jg1oUc42pK6VlyBBZo65PdnokIc2g7gXxWTkRiuGB3fhUZaYn99pko6uCEH
5+
bSKzbdhcS6aPJWyH2GU/zLhG8uy1xUGmMiAxyi5NFoMdMi8bt6y33DoLzwKhxUzt
6+
rQFbxYFM+eGgwJe9bZVq8tvWrlItrDvW5tKJ918KIwa0OUqIIuUEWsXPsmDLhK/1
7+
lE/mkgcpphYbWF8GZJ3S6WMOjcJjODR6H+GvuwIDAQABAoIBAQCuZUE/LaYDF6CW
8+
FVCoDhR7t2P184OR6Bzizw4oqXyVfvXuQuWEE0i99k9LAxB3bhksGKX0Hx0hCPHa
9+
j2yWwQS887vzmuK3gH4F8eDGcCUA+XhtFQU83PlaRe93Jygi+YPmSduBqkkuFFY5
10+
0zXcl/qdk4hOCQohedu19DrvNNx7mxq1wPtaHuLXqQEYHYETF61mbs2qvbmzmJAV
11+
CTfzBkv03xKL0IBjF2MZ0cShLxYiZdotsjeCZBQ7m5PKa41GOgPLoLBx0th2uBA1
12+
wKqx/XQOx/QL/uHkd8yLhuvdrmsy1PWG3ZUDdIxI7iOJfY/PrxgrExVfniMG7G0N
13+
UHlyKNxhAoGBANdm3mtXu2HK7jLXueOeAMV11FhmWMjKSTZWLIf491AqNW5Rp2Of
14+
U1vkuRQcuOSepnEgS2WWkOEEfX+SOX+86MumozJRXnvSeJE9hnq6lgZRoaxcZUyS
15+
T1K1SoM8ANedNm4z+H3BNspRy0By1zrjvJmEeIUjlp5RiBF9eCiQYlpnAoGBAM9U
16+
1zKWDyHIoUMAzRPe+dj+ONxr+ImsN4NRyYdVINIDlZ+ZCUDt1xVEa6Ksd/Mmz3US
17+
zbbVe9EEETsOOcyzUWBx8xigefxO5hJ6HV/Z3e411JzDmj00UI8VSCNK1iCLE2sp
18+
+VUXWOF+KlNb6PRw8ztWG0SKYEkkHPt2QXEzVdONAoGAVieiDONBYqMNVS6t/lnD
19+
SzeO4HDHUECAuggLtbMiEGFhj6d/QTyH1fiNAntehKrkPdlB7vcjKa1nGPB+qRYB
20+
MvuKyOR82x/a85TdRhd9TDe4Z71pExBuQ9GZZRZJ6/PIwpls6bevV4sRtcx5Q+e1
21+
Ft5CalZKtzY7K2u49NiTTj8CgYBFEtTnK4s7DCZ9tiScvCqtGnVDKk2RQGj2PSdR
22+
CRF4Jm2Q0GF+2j5P/Y2GksMbpRB0xqD2isVHa316GVE0W4F/CjedOsmpP3fzK+/h
23+
YSpJFHITEC+wuF8mbEauS15vVSZRC5jfunmIFopvXy2LUp4WZKeM/DT76SYmuM0w
24+
s5OieQKBgFf982X5HHS+TJmNhy+OaFjwDdsLN3Ww3nAkGEKDBUOLfi6L3WUuXNMd
25+
r1mZQ4kOxumMFn/x4/OftVGh3XhZfkAiYd4Gg3Hq9K74xmUeHDWf+Qk9HsRhBzJG
26+
nR+AYGo0e/1/t2yvKD8C+FNaGrjrLlFFuUeN4QUdDEmvULErXcGE
27+
-----END RSA PRIVATE KEY-----

‎.jenkins/certs/testnode.crt‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.jenkins/certs/testnode.key‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,17 +267,17 @@ else
267267
$(eval xpack_env += --env "xpack.security.enabled=true")
268268
$(eval xpack_env += --env "xpack.security.http.ssl.enabled=true")
269269
$(eval xpack_env += --env "xpack.security.http.ssl.verification_mode=certificate")
270-
$(eval xpack_env += --env "xpack.security.http.ssl.key=certs/testnode.key")
271-
$(eval xpack_env += --env "xpack.security.http.ssl.certificate=certs/testnode.crt")
270+
$(eval xpack_env += --env "xpack.security.http.ssl.key=certs/elasticsearch.key")
271+
$(eval xpack_env += --env "xpack.security.http.ssl.certificate=certs/elasticsearch.crt")
272272
$(eval xpack_env += --env "xpack.security.http.ssl.certificate_authorities=certs/ca.crt")
273273
$(eval xpack_env += --env "xpack.security.http.ssl.verification_mode=none")
274274
$(eval xpack_env += --env "xpack.security.transport.ssl.enabled=true")
275-
$(eval xpack_env += --env "xpack.security.transport.ssl.key=certs/testnode.key")
276-
$(eval xpack_env += --env "xpack.security.transport.ssl.certificate=certs/testnode.crt")
275+
$(eval xpack_env += --env "xpack.security.transport.ssl.key=certs/elasticsearch.key")
276+
$(eval xpack_env += --env "xpack.security.transport.ssl.certificate=certs/elasticsearch.crt")
277277
$(eval xpack_env += --env "xpack.security.transport.ssl.certificate_authorities=certs/ca.crt")
278278
$(eval xpack_env += --env "xpack.security.transport.ssl.verification_mode=none")
279-
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/testnode.crt:/usr/share/elasticsearch/config/certs/testnode.crt")
280-
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/testnode.key:/usr/share/elasticsearch/config/certs/testnode.key")
279+
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/elasticsearch.crt:/usr/share/elasticsearch/config/certs/elasticsearch.crt")
280+
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/elasticsearch.key:/usr/share/elasticsearch/config/certs/elasticsearch.key")
281281
$(eval xpack_volumes += --volume "$(PWD)/.jenkins/certs/ca.crt:/usr/share/elasticsearch/config/certs/ca.crt")
282282
endif
283283
endif

0 commit comments

Comments
 (0)