Merge CIP code

This commit is contained in:
Stephen Marshall
2019-05-10 10:53:48 +01:00
committed by Arthur Barr
parent 4a3bdf3b53
commit c079c1b60d
17 changed files with 274 additions and 32 deletions

View File

@@ -21,9 +21,19 @@ import (
// postInit is run after /var/mqm is set up
func postInit(name string) error {
web := os.Getenv("MQ_BETA_ENABLE_WEB_SERVER")
if web == "true" || web == "1" {
// Configure the web server (if installed)
enableWebServer := os.Getenv("MQ_ENABLE_EMBEDDED_WEB_SERVER")
if enableWebServer == "true" || enableWebServer == "1" {
// Configure Single-Sign-On for the web server (if enabled)
enableSSO := os.Getenv("MQ_BETA_ENABLE_SSO")
if enableSSO == "true" || enableSSO == "1" {
err := configureSSO()
if err != nil {
return err
}
}
// Configure the web server (if enabled)
err := configureWebServer()
if err != nil {
return err