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

PR comments

Browse Source
This commit is contained in:
Robert Parker
2019-05-30 09:16:06 +01:00
parent b64c060ef4
commit 0a9c745d96
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/runmqserver/main.go
View File

@@ -148,7 +148,7 @@ func doMain() error {
// Print out versioning information
logVersionInfo()
keylabel, cmsDB, p12Trust, _, err := tls.ConfigureTLSKeystores(keyDir, trustDir, keystoreDir)
keylabel, cmsDB, p12Trust, _, err := tls.ConfigureTLSKeystores(keyDir, trustDir, keyStoreDir)
if err != nil {
logTermination(err)
return err

8
cmd/runmqserver/tls.go
View File

@@ -27,7 +27,7 @@ import (
)
// Location to store the keystores
const keystoreDir = "/run/runmqserver/tls/"
const keyStoreDir = "/run/runmqserver/tls/"
// KeyDir is the location of the certificate keys to import
const keyDir = "/etc/mqm/pki/keys"
@@ -124,10 +124,10 @@ func configureTLS(certLabel string, cmsKeystore tls.KeyStoreData, devmode bool)
func configureSSOTLS(p12TrustStore tls.KeyStoreData) (string, error) {
// TODO find way to supply this
// Override the webstore variables to hard coded defaults
webkeyStoreName := tls.IntegrationDefaultLabel + ".p12"
webKeyStoreName := tls.IntegrationDefaultLabel + ".p12"
// Check keystore exists
ks := filepath.Join(keystoreDir, webkeyStoreName)
ks := filepath.Join(keyStoreDir, webKeyStoreName)
_, err := os.Stat(ks)
if err != nil {
return "", fmt.Errorf("Failed to find existing keystore %s: %v", ks, err)
@@ -145,5 +145,5 @@ func configureSSOTLS(p12TrustStore tls.KeyStoreData) (string, error) {
return "", err
}
return webkeyStoreName, nil
return webKeyStoreName, nil
}