From 3ba37b2b2b9d5f2be641d4cea2d8e9cd790ffc61 Mon Sep 17 00:00:00 2001 From: mamgainp Date: Thu, 9 Jan 2020 11:44:02 +0530 Subject: [PATCH] undo some changes mqwebauth --- cmd/runmqserver/webserver.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/runmqserver/webserver.go b/cmd/runmqserver/webserver.go index 63eb359..e34ea9f 100644 --- a/cmd/runmqserver/webserver.go +++ b/cmd/runmqserver/webserver.go @@ -22,10 +22,12 @@ import ( "os/user" "path/filepath" "strconv" + "strings" "syscall" "github.com/ibm-messaging/mq-container/internal/command" "github.com/ibm-messaging/mq-container/internal/copy" + "github.com/ibm-messaging/mq-container/internal/mqtemplate" "github.com/ibm-messaging/mq-container/internal/tls" ) @@ -108,6 +110,15 @@ func configureSSO(p12TrustStore tls.KeyStoreData) (string, error) { return "", err } + // Process SSO template for generating file mqwebuser.xml + /* The variable adminUsers is expected to have a empty string as we are no longer + passing any value in the charts */ + adminUsers := strings.Split(os.Getenv("MQ_WEB_ADMIN_USERS"), "\n") + err = mqtemplate.ProcessTemplateFile(mqwebDir+"/mqwebuser.xml.tpl", mqwebDir+"/mqwebuser.xml", map[string][]string{"AdminUser": adminUsers}, log) + if err != nil { + return "", err + } + // Configure SSO TLS return tls.ConfigureWebKeystore(p12TrustStore) }