academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added initial set of NativeHA docker tests, updated HA TLS env

Browse Source
This commit is contained in:
Luke Powlett
2021-01-14 14:00:52 +00:00
committed by Luke J Powlett
parent 1d41f4b138
commit 8a2faf2955
9 changed files with 680 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/ha/ha.go
View File

@@ -1,5 +1,5 @@
/*
© Copyright IBM Corporation 2020
© Copyright IBM Corporation 2020, 2021
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -45,12 +45,7 @@ func ConfigureNativeHA(log *logger.Logger) error {
if err != nil {
return err
}
certLabel, ok := os.LookupEnv("MQ_NATIVE_HA_TLS_CERTLABEL")
if !ok {
certLabel = keyLabel
}
templateMap["CertificateLabel"] = certLabel
templateMap["CertificateLabel"] = keyLabel
keyRepository, ok := os.LookupEnv("MQ_NATIVE_HA_KEY_REPOSITORY")
if !ok {

12
internal/tls/tls.go
View File

@@ -1,5 +1,5 @@
/*
© Copyright IBM Corporation 2019
© Copyright IBM Corporation 2019, 2021
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -43,19 +43,19 @@ const cmsKeystoreName = "key.kdb"
// p12TruststoreName is the name of the PKCS#12 Truststore
const p12TruststoreName = "trust.p12"
// keystoreDir is the location for the default CMS Keystore & PKCS#12 Truststore
// keystoreDirDefault is the location for the default CMS Keystore & PKCS#12 Truststore
const keystoreDirDefault = "/run/runmqserver/tls/"
// keystoreDirHA is the location for the HA CMS Keystore
const keystoreDirHA = "/run/runmqserver/ha/tls/"
// keyDir is the location of the keys to import
// keyDirDefault is the location of the default keys to import
const keyDirDefault = "/etc/mqm/pki/keys"
// keyDir is the location of the HA keys to import
// keyDirHA is the location of the HA keys to import
const keyDirHA = "/etc/mqm/ha/pki/keys"
// trustDir is the location of the trust certificates to import
// trustDirDefault is the location of the trust certificates to import
const trustDirDefault = "/etc/mqm/pki/trust"
type KeyStoreData struct {
@@ -103,7 +103,7 @@ func ConfigureDefaultTLSKeystores() (string, KeyStoreData, KeyStoreData, error)
// ConfigureHATLSKeystore configures the CMS Keystore & PKCS#12 Truststore
func ConfigureHATLSKeystore() (string, KeyStoreData, error) {
// Create the CMS Keystore & PKCS#12 Truststore
// Create a CMS Keystore only
tlsStore, err := generateHAKeystore()
if err != nil {
return "", tlsStore.Keystore, err

2
internal/tls/tls_web.go
View File

@@ -1,5 +1,5 @@
/*
© Copyright IBM Corporation 2019, 2020
© Copyright IBM Corporation 2019, 2021
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.