Properly load creds from env and save them when server cmd is executed (#2970)

This commit is contained in:
Anis Elleuch
2016-10-18 07:14:41 +01:00
committed by Harshavardhana
parent 0f26ec8095
commit 2005d656e6
2 changed files with 21 additions and 21 deletions

View File

@@ -174,6 +174,23 @@ func Main() {
err := initConfig()
fatalIf(err, "Unable to initialize minio config.")
// Fetch access keys from environment variables and update the config.
accessKey := os.Getenv("MINIO_ACCESS_KEY")
secretKey := os.Getenv("MINIO_SECRET_KEY")
if accessKey != "" && secretKey != "" {
if !isValidAccessKey.MatchString(accessKey) {
fatalIf(errInvalidArgument, "Invalid access key.")
}
if !isValidSecretKey.MatchString(secretKey) {
fatalIf(errInvalidArgument, "Invalid secret key.")
}
// Set new credentials.
serverConfig.SetCredential(credential{
AccessKeyID: accessKey,
SecretAccessKey: secretKey,
})
}
// Enable all loggers by now.
enableLoggers()