MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-26 22:23:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

config: Allow non-standard config dir to be configured with SSL. (#3583)

Browse Source
This commit is contained in:
Harshavardhana 2017-01-15 16:53:01 -08:00 committed by GitHub
parent caecd75a2a
commit bf2b8879b7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/globals.go
View File

@ -129,9 +129,7 @@ func setGlobalsFromContext(c *cli.Context) {
if globalConfigDir == "" { if globalConfigDir == "" {
console.Fatalf("Unable to get config file. Config directory is empty.") console.Fatalf("Unable to get config file. Config directory is empty.")
} }
// Set global quiet flag. // Set global quiet flag.
globalQuiet = c.Bool("quiet") || c.GlobalBool("quiet") globalQuiet = c.Bool("quiet") || c.GlobalBool("quiet")
// Is TLS configured?.
globalIsSSL = isSSL()
} }

7
cmd/main.go
View File

@ -165,11 +165,14 @@ func checkUpdate() {
// Generic Minio initialization to create/load config, prepare loggers, etc.. // Generic Minio initialization to create/load config, prepare loggers, etc..
func minioInit(ctx *cli.Context) { func minioInit(ctx *cli.Context) {
// Sets new config directory.
setGlobalConfigPath(globalConfigDir)
// Set global variables after parsing passed arguments // Set global variables after parsing passed arguments
setGlobalsFromContext(ctx) setGlobalsFromContext(ctx)
// Sets new config directory. // Is TLS configured?.
setGlobalConfigPath(globalConfigDir) globalIsSSL = isSSL()
// Migrate any old version of config / state files to newer format. // Migrate any old version of config / state files to newer format.
migrate() migrate()