Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0beab9f
Routes.Public.Galley.Conversation: Remove version overlap in endpiont…
akshaymankar Aug 28, 2024
fe9f7a1
integration: Verify remove propsals from the backend in group convos
akshaymankar Aug 29, 2024
4a246ed
integration-tests: Use separate mls private keys for each env
akshaymankar Aug 29, 2024
3e316d5
integration: resetClientGroup: Use MLS public keys for creator of the…
akshaymankar Aug 29, 2024
26bea6a
integration: Add tests for how the new API is supposed to work
stefanwire Sep 2, 2024
26e5062
wire-api{,-federation}: Add new APIs for returning MLS public keys fo…
stefanwire Sep 2, 2024
fb1a185
galley: Implement new APIs for returning MLS public keys when getting…
stefanwire Sep 2, 2024
bc7277b
integration: Adjust one2one conv tests to use the new API
stefanwire Sep 2, 2024
beebd8d
galley.integration.yaml: fix path of the backend's public keys
stefanwire Sep 2, 2024
106a827
add golden tests
stefanwire Sep 2, 2024
288a634
charts/integration: Add mls private keys for dynamic backends
stefanwire Sep 3, 2024
b005bfa
integration: Fix API versions to be used for fed-v0 and v1 envs
stefanwire Sep 3, 2024
ae4c2c4
BackendNotificationPusherSpec: Fix API version test
akshaymankar Sep 3, 2024
0b45d54
hack/bin/gen-certs.sh: Also gen certs for federation-v1
akshaymankar Sep 3, 2024
5ee2e75
integration: Remove commented out code
akshaymankar Sep 4, 2024
75a3456
integration: Describe how one2one conversations should work when talk…
akshaymankar Sep 4, 2024
fbedd1d
integration/SetupHelpers: Slightly nicer way to detect backend API ve…
akshaymankar Sep 4, 2024
d7fbdd7
wire-api: Add epoch_timestamp to serialization of conv Protocol
akshaymankar Sep 4, 2024
25491eb
federation-api-galley: Use Protocol from client API V5 when returning…
akshaymankar Sep 4, 2024
2868ab1
galley-integration: Delete test which is already covered by new integ…
akshaymankar Sep 4, 2024
e982456
galley: Only allow getting remote MLS 1:1 convs if the remote support…
akshaymankar Sep 4, 2024
1154b19
galley: Do not return 1:1 conversations in federation API V1
akshaymankar Sep 4, 2024
ccf0140
galley: Add query param for public key format to "get-one-to-one-mls-…
stefanwire Sep 5, 2024
5e35f32
Rename One2OneMLSConversation -> MLSOne2OneConversation
akshaymankar Sep 5, 2024
e5c27ce
wire-api: Fix golden test JSONs
akshaymankar Sep 5, 2024
9752669
wire-api: Remove redundant import
stefanwire Sep 5, 2024
b293f39
MLSOne2OneConversation: Add dynamic param to swagger name
stefanwire Sep 5, 2024
9cc1030
galley: Log warning when getting One2One conv and remote doesn't have…
stefanwire Sep 5, 2024
fd992b9
wire-api-federation: Fix wrongly generated golden test
stefanwire Sep 5, 2024
67e0e57
galley: Fix constraints
stefanwire Sep 5, 2024
69c5ea5
integration/testSupportedProtocols: Don't run for federation-v0
akshaymankar Sep 5, 2024
09a921a
galley: Move JWK key format to client APIv7
stefanwire Sep 6, 2024
bf98a48
hack: Fix MLS removal keys for domain2
akshaymankar Sep 9, 2024
e4c52e5
Changelog
akshaymankar Sep 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion changelog.d/1-api-changes/jwk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
The `mls/public-key` endpoint now takes a `format` query parameter which can be either `raw` (default, for raw base64-encoded keys) or `jwk` (for JWK keys)
From API version 7 the `GET /mls/public-key` and `GET /conversations/one2one/:domain/:uid` endpoints now take a `format` query parameter which can be either `raw` (default, for raw base64-encoded keys) or `jwk` (for JWK keys) (#4216, #4224)
1 change: 1 addition & 0 deletions changelog.d/1-api-changes/one2one
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`GET /conversations/one2one/:domain/:uid` now returns `public_keys` along with the conversation containing all MLS public keys for the backend which will host this conversation (since v6).
12 changes: 12 additions & 0 deletions charts/integration/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ metadata:
"helm.sh/hook": post-install
"helm.sh/hook-delete-policy": before-hook-creation
data:
{{- range $name, $dynamicBackend := .Values.config.dynamicBackends }}
{{ $name }}-mls-removal-key-ed25519.pem: {{ $dynamicBackend.mlsPrivateKeys.removal.ed25519 | quote }}
{{ $name }}-mls-removal-key-ecdsa_secp256r1_sha256.pem: {{ $dynamicBackend.mlsPrivateKeys.removal.ecdsa_secp256r1_sha256 | quote }}
{{ $name }}-mls-removal-key-ecdsa_secp384r1_sha384.pem: {{ $dynamicBackend.mlsPrivateKeys.removal.ecdsa_secp384r1_sha384 | quote }}
{{ $name }}-mls-removal-key-ecdsa_secp521r1_sha512.pem: {{ $dynamicBackend.mlsPrivateKeys.removal.ecdsa_secp521r1_sha512 | quote }}
{{- end }}
integration.yaml: |
brig:
host: brig.{{ .Release.Namespace }}.svc.cluster.local
Expand Down Expand Up @@ -118,6 +124,12 @@ data:
{{ $name }}:
domain: {{ $dynamicBackend.federatorExternalHostPrefix }}.{{ $.Release.Namespace }}.svc.cluster.local
federatorExternalPort: {{ $dynamicBackend.federatorExternalPort }}
mlsPrivateKeyPaths:
removal:
ed25519: "/etc/wire/integration/{{ $name }}-mls-removal-key-ed25519.pem"
ecdsa_secp256r1_sha256: "/etc/wire/integration/{{ $name }}-mls-removal-key-ecdsa_secp256r1_sha256.pem"
ecdsa_secp384r1_sha384: "/etc/wire/integration/{{ $name }}-mls-removal-key-ecdsa_secp384r1_sha384.pem"
ecdsa_secp521r1_sha512: "/etc/wire/integration/{{ $name }}-mls-removal-key-ecdsa_secp521r1_sha512.pem"
{{- end }}
cassandra:
host: {{ .Values.config.cassandra.host }}
Expand Down
85 changes: 84 additions & 1 deletion charts/integration/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,96 @@ config:
dynamic-backend-1:
federatorExternalHostPrefix: dynamic-backend-1
federatorExternalPort: 10098
mlsPrivateKeys:
removal:
ed25519: |
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIJrGRHzIwjc5byivY2l+/MqbH3ty1yetYG8d5p4GGHhk
-----END PRIVATE KEY-----
ecdsa_secp256r1_sha256: |
-----BEGIN PRIVATE KEY-----
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgaeLidXfwi/RVvWZ4
OHoQhicePLIfyDZI7gMVsyXtec6hRANCAARM6EWywmjaCXtvsQ1M2edrbMescC+j
GSIhBrlE7igzhookThDBvOGAL67vf8xz+hw7tE8NqfzbdJQBL8NQik2L
-----END PRIVATE KEY-----
ecdsa_secp384r1_sha384: |
-----BEGIN PRIVATE KEY-----
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDD1rK50pFsZmOomBiNQ
QFRRwAmed8Ox+nFseYbKzjLIAgWH0sMQ5DU8SAK8ks+GROShZANiAATyX0XQ6x6A
pi+HKz+ReWV9iIUOttxJv9u2aTY5ZrQ42IJs3fV1AGz1BE52uDvhbILOD9WfqZ9d
6MqCjF6OqYT9nmnPkQ+CKC2XPzSVBpqJtuHXiMfFrc7n05E8CdIHOkI=
-----END PRIVATE KEY-----
ecdsa_secp521r1_sha512: |
-----BEGIN PRIVATE KEY-----
MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAQnVcp85/mC6r91yB
XjhiHOp4j450UcThSmDBdva4Pj9ihXvAScEFabus7CeECvUT3auqXKY9iSR45vQq
JuFI/0uhgYkDgYYABAG1paU01rRuYG4K2PWaIIbB9RuiYg5GVsu5mu6VHjYEH+7c
1AGuCPEsUoM542cn3T1utv0EMtoj4yFPvf0xBs7AowHW04JsgMFzpWm8T1e/91n1
IEkT5xOnq8obn7p4je9Ui95ojEA/n49gsTKsuO1qv2n79PnStLfn2yT5lAtcTcva
6Q==
-----END PRIVATE KEY-----
dynamic-backend-2:
federatorExternalHostPrefix: dynamic-backend-2
federatorExternalPort: 11098
mlsPrivateKeys:
removal:
ed25519: |
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIDgG4Dhqfq6KRyGKtEFiPeP+Nq1DBsTY31q3f/tC/lnk
-----END PRIVATE KEY-----
ecdsa_secp256r1_sha256: |
-----BEGIN PRIVATE KEY-----
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgz0IEyU4GYrpkVH2y
iR87BMD1VAfBgl69WedewvA/Vl+hRANCAASTYYD2BF2E1zqPKYZtpHW1quo+YBsv
SAeznMX1bOeoOLD8zyFDHEGb3I9S90iGjYKTUogY+QfbbiqAiBIuSig7
-----END PRIVATE KEY-----
ecdsa_secp384r1_sha384: |
-----BEGIN PRIVATE KEY-----
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDA43epgPhtj4s0G3aXQ
TPXjnQHhiQ7Hfze+K8HgDSUL+Ds31v+g+Ko/OZrAA7povdWhZANiAATXd/dKoFvA
wlISC4MAbBsDV6g2oezzZt0nXUq4uysANJ24s+BNey7tYpB36qAOUhqmCzJW5IFJ
22ttorUXSTaJeUIUdRiwD7xJ54z3NV5Wj8CUskvp0DIf/ILkOpbxdQY=
-----END PRIVATE KEY-----
ecdsa_secp521r1_sha512: |
-----BEGIN PRIVATE KEY-----
MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAjGOdWinAUUopQCYW
6Ch4UuwdHhTERbUS90bQiQyoPdnTrTT8+NsYsB8DmPLltxls6h28q0IGCKUmO9ph
8gFT0l6hgYkDgYYABAD3l73lFiVckI4V8BhR2x83o44dhjZA26d8SVSUBt9iuRbR
Lh0vP+zghhDQZLFLpfcL0Fo0K9H4HdQwe2cMxbOyQwDUC76ot9BdZjfsjKiRK6+k
ZNlnHSWx15yg8gF0dpt2eVn1LBLB0JvRcauYVMfKNox1IU8DY0ZiuO4DJNXRDVEI
7w==
-----END PRIVATE KEY-----
dynamic-backend-3:
federatorExternalHostPrefix: dynamic-backend-3
federatorExternalPort: 12098

mlsPrivateKeys:
removal:
ed25519: |
-----BEGIN PRIVATE KEY-----
MC4CAQAwBQYDK2VwBCIEIB/Jddpef01pYWQXUEFmJ+k6dDQE7fVSKfk7/AyQaOnU
-----END PRIVATE KEY-----
ecdsa_secp256r1_sha256: |
-----BEGIN PRIVATE KEY-----
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgIkeTuHoMtzsuaN3f
zug+mp/IlejrG1W4z/lOU9yGNqKhRANCAASLReHnUMJfSs0pDFxVYIgCOThRsiCD
Fq/6oKzWYnvX+taJgNUCVm7QND7Q9ll+Vy4ymZmE9YH1QuNW4FbVe1X6
-----END PRIVATE KEY-----
ecdsa_secp384r1_sha384: |
-----BEGIN PRIVATE KEY-----
MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDB0dp/epJB3XhCeRcYJ
C76Ll50HHb/H2GR/UBFyAWYtQ8mbaXWis8NPjvYmqrqd5VWhZANiAARoOjIYWdAP
Y910LsLGcihvmnoFx7atJbOhaGTem57P/DOkYqcYohUcz6WaCuqzk/ZEj8NZtdvF
4AYt0mnxkl9L5pt2a6i2HWW+4puR+JMmWD9qj0lRc5AQeEtmbuohIfg=
-----END PRIVATE KEY-----
ecdsa_secp521r1_sha512: |
-----BEGIN PRIVATE KEY-----
MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBfyz5LCeeA0seQo1O
jlQiUKxL4tWX23mD5G5Y5nra3Ju/7mNYp/sIX5BS81iWno5N6KfEdgUtgEffa4Xj
nuyF2QqhgYkDgYYABAF3eFOMjqpO7hDdVua9WgquGdFRRd3LWLhY0fyeyiQn/7yr
vLIb01f8dX9UVFKMxw77ZMMcfF+uW5Enxa8kadDcmwHIiIh/6jW0oGlFxkmwmecr
MwfpR6lZMbtQMD4rm8AwQAsFCBCRyPyK8bWanzMYusbnCdS/nBB5YB8x0ejjYFlU
RQ==
-----END PRIVATE KEY-----
cassandra:
host: cassandra-ephemeral
port: 9042
Expand Down
32 changes: 16 additions & 16 deletions deploy/dockerephemeral/docker/elasticsearch-ca.pem
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
-----BEGIN CERTIFICATE-----
MIIDLzCCAhegAwIBAgIUXMOPFnGTAQ30+xOQ2od/HYZiSwQwDQYJKoZIhvcNAQEL
MIIDLzCCAhegAwIBAgIUUOLn63PL3FEyGdhOK1ocDAn8dC8wDQYJKoZIhvcNAQEL
BQAwJzElMCMGA1UEAwwcZWxhc3RpY3NlYXJjaC5jYS5leGFtcGxlLmNvbTAeFw0y
NDA3MTgwNjQ4MjBaFw0zNDA3MTYwNjQ4MjBaMCcxJTAjBgNVBAMMHGVsYXN0aWNz
NDA5MDMxMjAzMzhaFw0zNDA5MDExMjAzMzhaMCcxJTAjBgNVBAMMHGVsYXN0aWNz
ZWFyY2guY2EuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
AoIBAQC5RatgsLSQdpLdJyW+kmpOeyIoJgJVm+76D3eSx5tPnSMtsGolXNJHynR4
AzJ+h5tiSOhK+x/RPiv7ofjD5P+cl6q0cWckhQ089sp+deRjZrhvTskn/0xkg9W1
Gk2awYl9Oq9ij2hLSQgtw+QRkv0LkdnQLKyGWQ8N7BLksAcvr9N5gTaLE3PVQQop
SaD72IE+gGk4HDQzCque/eeqNjp5qq9umFlXJk8GX3HfB14VRslGmh5OIs8y/HJG
FRMcbVXJ11T+d6xpmzCFfwXYSN5OJghs1AC6SyirqYEgOigJsMnioYbbyKHh+HLA
YKnY+Bi/KQJQ/ipwzibW9G//058FAgMBAAGjUzBRMB0GA1UdDgQWBBRRMD3Fk8ui
R5eRsezFZrT0oMKlpzAfBgNVHSMEGDAWgBRRMD3Fk8uiR5eRsezFZrT0oMKlpzAP
BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAQSW/I5EbTbsBY4rIA
RX+0S7gbx2+d1fhMFEloLagXipn8vd8PGtX9riYSb4k2KmP4BjeQo3TMpJVTUmh8
RkppbOLabIcyuCI732PJfwlkRHBThguv905uuzil8IC1mDR7qy6Rkg2ByDRlqAgB
icX/3uG7A6XDNsNrwP8Pj0X/YRSbqLIlFtyQ6RCCOYn1CCUDkciHgDMHlgK90r4s
+hrgtB6zKdMI89hnn8MLbQ+eaZ9UDpYbovBbDvZfEI5AaTlSQTL503+gM5bUgZRl
YT8z44Piip8VhkKwb/31C+tht6gNvqEQBFudusrHrg/KphpFTpAHQgW2vA/z9LJt
vzAR
AoIBAQDhfp2hokSJ88qb6Gl8BBwg4jMbkt4l2ynOa/lO6DZFRheFlWZBaUZAcj1o
jBgbd3EoOXygZReL9TGBRrc5iACzytlOJkwMgNUUIq1KsPwWII41VJw3h3NO07tM
Tsf0kFvH1pEllJqorhQ1eZnU1SISyQcjk0oRQEyWd6arF7TLHna69OHF2ybYYXMD
MFWNr+O6t8RUfYs4kb7z1Nx3OnUKrUhIyaYeoyvBBOdXA5/G5GenDu/G4iVozsuL
gofYWu+77EnpProF0KRK+XlKakvF7bD26Qm1ol5qsXbdXOXKYq/c4KDdC938HNd/
FNPz7EsnW0brBXqtz8TeQmxHix7DAgMBAAGjUzBRMB0GA1UdDgQWBBTWzp/VRTGq
s/IwlrROQGDwavTpyzAfBgNVHSMEGDAWgBTWzp/VRTGqs/IwlrROQGDwavTpyzAP
BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBFue/SGpAVZ0TOVp8l
bdaaY/e9wUBSdCH5b39Nzd3rKmH3lIHqcafLlFCx+scKUIlFbohJr0aTK339wFfl
L0LzBJVUT9JzeDNPhk8pl/jBJk+eGP3fiykFMCgxxGvHtccHu8E/y8U0SeEtKqDn
Xy0ZbC3M54UedhDpHMovfHEsfN24Ev0DK13sBR2T8fmXCyCrfq887cCqJyP2ODgb
xAY/R4F8Ueadn0ywHYSY3MqmDsvDul0QlaOu2J5A0+k5oy4hAfFB8PzPYZrmPkeU
N5oxudTTihIZ+0JiL2JmWGBzMGzgtmD1rHC6lugUlWq+BoPu2+/+hn8RcVHBCFDk
WMSU
-----END CERTIFICATE-----
32 changes: 16 additions & 16 deletions deploy/dockerephemeral/docker/elasticsearch-cert.pem
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
-----BEGIN CERTIFICATE-----
MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDDBxlbGFz
dGljc2VhcmNoLmNhLmV4YW1wbGUuY29tMB4XDTI0MDcxODA2NDgyMVoXDTM0MDcx
NjA2NDgyMVowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
AAOCAQ8AMIIBCgKCAQEAo03bK4ePl/aJdjMVBegNVn/usLAGstuSYx6fjrkCpDoa
xlsWhKTIzIS1Kct2az8PS18a54G2UEC1LG2RsonD/TqEqOzm91B9IvQk+4/KEWFk
bI60yaLkoS5aErqCsKVirjrMY7iUHH2theB2VCzhKQbe/NWq6/9gs7kWis8ORKVw
MZS7Mu2mP1isxkpDL/faFEOO8xICg3vT4tPe0w+WCkcuIG8iP+/EuAvJfS7mzlr9
Dyfxq2rktZPcofgxzlpKo23iPwxwtoTq2FKYLWaF3WPb6jci3YOrWeAbo45Mv7zx
iZc76ihuah7FfuTu6zcBedhuuqPKY0xyQ93opWKswQIDAQABo3oweDAdBgNVHSUE
dGljc2VhcmNoLmNhLmV4YW1wbGUuY29tMB4XDTI0MDkwMzEyMDMzOFoXDTM0MDkw
MTEyMDMzOFowFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
AAOCAQ8AMIIBCgKCAQEAwDpnRRMmtz2g/5RBTO7FcuOsy3ss5g3E1npSOyQ4MebM
vM3fIZd+xVPNj6ZDxIHotLS17av41YmHCEtSgu0BtOda9hvn62HBR3Gyl6TDEvvC
ptHqxc+5ttrdKc5XqpI2lJsNUOUQhwQjYyTvbGwF5YxtHGc0mtUEJ7d/1qoT7A/y
W0KxTfclo7LPPBMiIF6Qzjn5iEguVPQm7jvQs9UbHad/ffMKDEBkBNs5joYTzLil
NFrnxxQKpxf4qS/cA62zeBS2dVvgZHqNeHfOF+v1DHItB/uoB9zRKFPvArI+Y+RR
uPsXuPNZgN210V55iDyDdU31Eh78ndShCSg6X3rfgQIDAQABo3oweDAdBgNVHSUE
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwFwYDVR0RAQH/BA0wC4IJbG9jYWxob3N0
MB0GA1UdDgQWBBQYML2G5YnBl34yhh0UEPYr+rGdQjAfBgNVHSMEGDAWgBRRMD3F
k8uiR5eRsezFZrT0oMKlpzANBgkqhkiG9w0BAQsFAAOCAQEALHy5QQLAcThsdt9Q
cL3VJzkPfDSOwFJ4L+hRMZBrPh0flbQn2gziVlbqdpsbh7ou1OTGJRkSnfWQbhqo
3Jeh+i6LhW1YjvX5n/zMq/A+gcE8DgK1m7m0IYaytESmyNbsbYcb8lv3pis+cZWb
ISFH8U/TYvpUgS4PM9+KtdfsPatakSRFlbcy8/3JLe5khnwdmTb0TGKiIlEfIuKh
UxVzJDUB0Fsa7ZRXEBkbQFPlWFIws3oATwMSLzA7AKEHEY3vf67ZzcPxD1gZU1Vn
2W8ABV25cT8EtwRldvZ9E8IwezAeLEi92x9LUaBy2YKBSgmm+wH/0Do8nGG0Zh5/
hFDF8w==
MB0GA1UdDgQWBBTxqOE025egTOExeT139PqO6dxGKDAfBgNVHSMEGDAWgBTWzp/V
RTGqs/IwlrROQGDwavTpyzANBgkqhkiG9w0BAQsFAAOCAQEAWyJLKHLcz3oKVZnH
KP7AR0ty0m9H4yeHVPT7/IjfUsemDkFhk9xcSHlqVEqNu7CHL/VjZ6wke79yGm4L
zBIqiTGKgHmFRTn+19bNg/K/IodAXaTWayEzAwrJmEU2W6aarxhL6IiyHHnDba2J
u9h/cVV2OGODdg3+QuEr/3UV5XQX6X3hVGa3YUb/sTt1tuj4Rs9e1UCoSL2+4NtM
20De1G5zF0z05SP5z9H98sryf69PysJjmSWc601S4iR22o2nGDA/JrPBnVHfL0Cj
Aah5YYqY4m2llOwTGTrQdrzX2Oe2Qwcm1ofmn0P8Y4uYvqg9sUXKR1yf92PjytoE
/ZIJPA==
-----END CERTIFICATE-----
52 changes: 26 additions & 26 deletions deploy/dockerephemeral/docker/elasticsearch-key.pem
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCjTdsrh4+X9ol2
MxUF6A1Wf+6wsAay25JjHp+OuQKkOhrGWxaEpMjMhLUpy3ZrPw9LXxrngbZQQLUs
bZGyicP9OoSo7Ob3UH0i9CT7j8oRYWRsjrTJouShLloSuoKwpWKuOsxjuJQcfa2F
4HZULOEpBt781arr/2CzuRaKzw5EpXAxlLsy7aY/WKzGSkMv99oUQ47zEgKDe9Pi
097TD5YKRy4gbyI/78S4C8l9LubOWv0PJ/GrauS1k9yh+DHOWkqjbeI/DHC2hOrY
UpgtZoXdY9vqNyLdg6tZ4Bujjky/vPGJlzvqKG5qHsV+5O7rNwF52G66o8pjTHJD
3eilYqzBAgMBAAECggEADKBUmFaDEeRUIjP2kFODUyimwLmIzbkau0LfDQQdV1ZO
GKpqoMyJi//yGUOr1G9L6ZohCeemZtPB+P1AcnX4Fd25lm1kDu4wZrdKyWUyN0rO
SXMf46aObS9Dc/GWG5NbVbj3xvllVkNEsIu3inBCjnoDXA18iYJgLIqHMCoB4pO/
tDsuH+2GcfnkMsaaMsWkqxAPhCJvzx0Qwnxgm60xE7FGuqkoECoDHT5vFeVREiEt
iLYUJgAOb/uIQGU96EHBVhfMSRNUmFRc/oOA8kHKO6zjyH1uZquUNkxsiYsphNmP
Qqan+Q+ZaJ5wtgyNzdJL8O0dwzBksLGqQOYeQBH4qwKBgQDZBOJUqeldZ2V7r+IS
n1riDnFD8MTr5UvvJhxypxb3xHM68LcqCidmo+MmksLgRZ1mPvsh2t2yLijKrbWU
GcRshSC1vqLUBUr+ptaNtR4WbEWwlFcS+ky/tJbgEnA5ykxlyvfGPDaNHQnf1i5u
kJBuP8BbjjzxVUhj7d2JD+h0mwKBgQDAowPoOffyaPAGfVZh2tQdquWSQmxqF+yw
kBlnZzewk2TdrQi96uOxovJIt+5L5OvIWLYvtWT3/VhQnNeBAmWbTZufbVwyzu9W
N/FlQqaqoR2F5IDCUuJwHD+d3b1l+R2EVSWhMVBBZgNboqMO32YYvDEmMjZWLumc
WSHAhDJD0wKBgHvnDvV5gNQkGUux0mgBdVkFF+PLThLEekMSxkErZrCVB5kKH/kv
jOlL/n9iYUK8XC4pHSZqGBMHyaBV5wqkX4H5zAAX1E0qrHORe4OyeXgh3vP+7WvX
XgRBrbZGsK498rpXVHlonViZ0K5sUVwsy1k2qrNbFS5QG6F6B/aeD4CrAoGAbfPe
BAwqYRvSfPHHf30m+3QTKyNsvDXBrJnjVikNGWVX+kuMpNJQepD2V9lcU8draWRx
QNP5uK7LXN/ZBdL3aeinPh1utbV12LF/wHuFo/joYAcoE0K56qHFEfeB5pWFaoYr
P1FlbJ6spf4zsgaDQPUR3KpmZ1TJlKsvX7JU+m8CgYAz3H23AnF1MEgKvi4xVIwV
ir6yD/Ezb70BB40NdNIib9XAYy7t8JrTmZMhHRLrC88i7vwy5KFd2m75XE/PGy5n
Bc4/O9zua/0wxAgpKKgsiv92H10XVP6yR5xJ//ATO/mGGFllFrZQae01yZZ+qwlA
MilofPD7tfCLoQl/SQ0KyQ==
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDAOmdFEya3PaD/
lEFM7sVy46zLeyzmDcTWelI7JDgx5sy8zd8hl37FU82PpkPEgei0tLXtq/jViYcI
S1KC7QG051r2G+frYcFHcbKXpMMS+8Km0erFz7m22t0pzleqkjaUmw1Q5RCHBCNj
JO9sbAXljG0cZzSa1QQnt3/WqhPsD/JbQrFN9yWjss88EyIgXpDOOfmISC5U9Cbu
O9Cz1Rsdp3998woMQGQE2zmOhhPMuKU0WufHFAqnF/ipL9wDrbN4FLZ1W+Bkeo14
d84X6/UMci0H+6gH3NEoU+8Csj5j5FG4+xe481mA3bXRXnmIPIN1TfUSHvyd1KEJ
KDpfet+BAgMBAAECggEADItTJWgSSPdx2/PcDg3v3yc55b54R9wCqh9p4dejfigq
WLDTnJDTEkP9gGAQgJCcs7wuOiAUmTTEFde6fvZB/AD0B+b6y7rBnuytw6UaINFC
mtnMiROc8jCWqa2APY6Ulr6GkC6elT0BJS1qHWhwOxJepXGbtnXrsz7Pjh3jtm4X
8tZ6/msANBKGzaEKaIg41YxUbr4tWr1G73IlnWkJwVrfLTHm1sAjDTqoYFo3xdlK
Ow3vm5+Zscv6sZmRzZDUuEdaBuyqkHr5X3L9lncfxG6WdpCi5JUFfihxegnV5yi6
5dL3Spu+ZdOrnHsQ/leaSEwzJOWAQlYvCrYoiOSKxQKBgQDuYeyff9JQkOxSlnzs
UO849VFQceltgjpiNF8D3O4bF6eE09qPljs0zWiGBvpwNLX+L/xJTEVv1625IB8I
W2SvBu+WhfwqlThwNBW0HWAn6V0ehEgu7dWaU2X5cNdyGdr8wqkLyZhFi8BepOyR
ytvO7Azeks/XnpJtZwhJzy1qFQKBgQDOb0MDwnEdYMmEZ3aDSvXO8xoifblrCTBl
ysCtj1jmplp0FV9VeWsuJawovzF8DaDtuCUOLBSimRU/56BflWRPivwSy2b70gJr
LXcvN1Wws2zBd6YJjqNCyu/d3eqLV8+YTL/ZpjyI5uEREfoR6mK3ze2S4KkOxPW1
snvtcq7WvQKBgQDPfnMtvl/9ergJhy4DsMsZpAb8Y7rQdDuHgZh2z1Z+RI+vAYzL
0POGGYlyqB5Tjr4fG/uYfYgvOuffLQN2Db9Mzle7iLKfCjYPDHcbyToKY4mHZ5NB
Lgnwg8lOXxdZHQJNYs8sEHS3jFaMyzeUC6Rar4LgNaAuSbug+L7xKCGapQKBgHF1
jWufjvQKojd3dherN3bK/m4+k45Uupj32vaJdt8uR0DODlu4JER0yC6NBvGbu/tr
3lHvwFets5QwBmEChuOBDBJ4YN2/Cz1E++CjlSFNPFUJIeTW1Lx9NWDH+4UieiLG
7Br/1v2Xh9QOAVefbyp+sDit6b0IW9PFiX90LMwxAoGBANorN+N/857GHDfZNadH
3z1TI3vFQCC99OZr98IUVJ2KR5/bxhnlknzY1BOqX0KVZxCelXUlyc1bPc9NZvDv
dpE2tuMf9Yi3QqUDMAz06NsBbJ07b/7Te+nPFFWnts6MLApM8BPDyvkqpWAiWMdd
5kIXKnYdDAyHqhfz46+yzxQa
-----END PRIVATE KEY-----
34 changes: 17 additions & 17 deletions deploy/dockerephemeral/docker/redis-ca.pem
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
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
-----END CERTIFICATE-----
32 changes: 16 additions & 16 deletions deploy/dockerephemeral/docker/redis-node-1-cert.pem
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDGDCCAgCgAwIBAgIBADANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRyZWRp
cy5jYS5leGFtcGxlLmNvbTAeFw0yNDA3MTgwNjQ4MjFaFw0zNDA3MTYwNjQ4MjFa
MAAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPy96cVsBu5V6JjKwB
zt+S7QuIXuvwVGAkzNF2R+sOSzBReh4fKP2bhkHp2bKsr9ZxFw7ECndQ8npm7Q46
P9/Xryj7lSVe9FypB1OAhnpP+cblep+I5y/2hKsvC19y0/ynDRzlBz+2nczjr++A
uQxOHghDuEew3561DLr35K1XFkj7Yg4vHU776/DcmwnWkdcetwxZ2V89q+CHtsMd
Qr/ZZrnod4hwVv9JzV14Z99aJv2aMubchNKZUqRwnv6BHSktzFXR1DPErAGErIVj
IHkTXhhIHSHD9e2VK5Qlk169EzrGNMSP0CT0i+yh4/RQgIJIJfLQPP4uyWppmj/Z
TZYFAgMBAAGjfjB8MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNV
HREBAf8EETAPggdyZWRpcy0xhwSsFAAfMB0GA1UdDgQWBBSnv9zqno1wP7lB0bx2
RSml5I2yEzAfBgNVHSMEGDAWgBQZAQiz5+eaFiYfCv/3OhzoNZIlxDANBgkqhkiG
9w0BAQsFAAOCAQEAIU2iEbP0fDoDejqMnv38VdumRegI46/HEpWNSmySGyzoCjnH
70FRs8B7qLJd0DZ6ofRUH1p5kmJ3z3SHSngEiCCU7sCwGIl2ahxf3B8tci1wBeRg
qbvcPgCSFqHxR40N7+Uc8Wp3E1UpidWPlQqVHffHAF3KX6M0ooikRb7qNPx4jGPI
gDy0gCFxau1u5V1JiXJ75hjSS3/OFysXweZymTc5t0e8D0/2CQCdvVjEZq4//bvy
xIRHWzOMgoNhW//io4QEUhe2c48QUbTAuXIzzuV23h8BZzIwXiCVlAtQPhJWJsC1
pHOVb8t/4hdvTAyjmMjwOICSxBqSh5qh80+sgw==
cy5jYS5leGFtcGxlLmNvbTAeFw0yNDA5MDMxMjAzMzlaFw0zNDA5MDExMjAzMzla
MAAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTtp3U0VPwBVJNULQF
S4BBlWBNf/8NMidOq23IsTcjkIFWO1XL+HFZoa1AArUSA/TaLBYyz9WmX7eLWvAU
ADM6mfAf2V6whmIs2H9ZRnY89bFWO2hzLWWp1qq3dXK1ywTLpw7DqU4OT0rtYZbp
QHeVY0mKKspF+YJTZzWB1hs8IX9355wXRlYBLPNQ5oHRb4/16J/UUFPIJjpUyHsq
T1LWmVREqisrq9u50FnNPeLXE6SDnHGRkYGQXzQOM/yAI75/QUOOqo5rt3Et52t5
pkOT45R0PbAC2UpR1usew0zVjRoQfFk9n38tXUSHKw/tW+ZY1xJqEKEiLGfnhhza
t4kjAgMBAAGjfjB8MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNV
HREBAf8EETAPggdyZWRpcy0xhwSsFAAfMB0GA1UdDgQWBBQsOxsq4X8dS/Ddl9l1
TWDb8Q5KKzAfBgNVHSMEGDAWgBSNcgRaq4sddGR0qWD3eVT168cULDANBgkqhkiG
9w0BAQsFAAOCAQEAaByeD08xOZCV0ZKsx7lHtiem5/XG01rMcDxNVrVguSD+mqhR
/j8ciTW2CruJ2X8ReTjNrI4X1nWLbh4rsrA56q4xkjkgJIfWQAdKCibXTrHOWfk5
dcYG1pqVdpD5bvsxAsY95jxqoVJHXHGN8ynC+lV39HbDJQFOdHLAP66NUrphp76a
OZKiuzUS6naeiHWoA9eIANFRz/JoQvyp109gdce5MH0iFwGFqNJU2rwilOpzQVc7
qldx7MHMnW5UYSTqryTOr8PS+xo24TSdHjIXmnOO3Ov0Pw7iPpGVGj56dAKgEisG
yGOAWYto8UBWKLox1vSSlfdkhAoDXluvE8EwRw==
-----END CERTIFICATE-----
Loading