MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-12 15:32:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: OpenID URL changed in console, adapt to new URL

Browse Source
This commit is contained in:
Harshavardhana 2021-09-27 19:51:24 -07:00
parent 4519450363
commit 84dcd25a36
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/common-main.go
View File

@ -138,7 +138,7 @@ func minioConfigToConsoleFeatures() {
} }
// if IDP is enabled, set IDP environment variables // if IDP is enabled, set IDP environment variables
if globalOpenIDConfig.URL != nil { if globalOpenIDConfig.URL != nil {
os.Setenv("CONSOLE_IDP_URL", globalOpenIDConfig.DiscoveryDoc.Issuer) os.Setenv("CONSOLE_IDP_URL", globalOpenIDConfig.URL.String())
os.Setenv("CONSOLE_IDP_CLIENT_ID", globalOpenIDConfig.ClientID) os.Setenv("CONSOLE_IDP_CLIENT_ID", globalOpenIDConfig.ClientID)
os.Setenv("CONSOLE_IDP_SECRET", globalOpenIDConfig.ClientSecret) os.Setenv("CONSOLE_IDP_SECRET", globalOpenIDConfig.ClientSecret)
os.Setenv("CONSOLE_IDP_HMAC_SALT", globalDeploymentID) os.Setenv("CONSOLE_IDP_HMAC_SALT", globalDeploymentID)

8
cmd/server-main.go
View File

@ -596,6 +596,14 @@ func serverMain(ctx *cli.Context) {
}() }()
} }
if serverDebugLog {
logger.Info("== DEBUG Mode enabled ==")
logger.Info("Currently set environment settings:")
for _, v := range os.Environ() {
logger.Info(v)
}
logger.Info("======")
}
<-globalOSSignalCh <-globalOSSignalCh
} }