From 3f19ea98bb93b3053f64206d2de7a70cda3d2f93 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Fri, 2 Nov 2018 11:53:45 -0700 Subject: [PATCH] Honor certs from config-dir (#6757) This was a regression introduced in 9fe51e392be56b9543216222e154893e2bff3537 --- cmd/server-main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/server-main.go b/cmd/server-main.go index 757a0f672..7080330d7 100644 --- a/cmd/server-main.go +++ b/cmd/server-main.go @@ -218,6 +218,9 @@ func serverMain(ctx *cli.Context) { logger.EnableQuiet() } + // Handle all server command args. + serverHandleCmdArgs(ctx) + // Create certs path. logger.FatalIf(createConfigDir(), "Unable to initialize configuration files") @@ -230,9 +233,6 @@ func serverMain(ctx *cli.Context) { globalRootCAs, err = getRootCAs(getCADir()) logger.FatalIf(err, "Failed to read root CAs (%v)", err) - // Handle all server command args. - serverHandleCmdArgs(ctx) - // Handle all server environment vars. serverHandleEnvVars()