diff --git a/cmd/root.go b/cmd/root.go index b43a63e..a5547fb 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -84,15 +84,23 @@ func init() { if len(os.Getenv("MP_MAX_MESSAGES")) > 0 { config.MaxMessages, _ = strconv.Atoi(os.Getenv("MP_MAX_MESSAGES")) } - if len(os.Getenv("MP_AUTH_FILE")) > 0 { - config.UIAuthFile = os.Getenv("MP_AUTH_FILE") - } if len(os.Getenv("MP_UI_AUTH_FILE")) > 0 { config.UIAuthFile = os.Getenv("MP_UI_AUTH_FILE") } if len(os.Getenv("MP_SMTP_AUTH_FILE")) > 0 { config.SMTPAuthFile = os.Getenv("MP_SMTP_AUTH_FILE") } + if len(os.Getenv("MP_UI_SSL_CERT")) > 0 { + config.UISSLCert = os.Getenv("MP_UI_SSL_CERT") + } + if len(os.Getenv("MP_UI_SSL_KEY")) > 0 { + config.UISSLKey = os.Getenv("MP_UI_SSL_KEY") + } + + // deprecated 2022/08/06 + if len(os.Getenv("MP_AUTH_FILE")) > 0 { + config.UIAuthFile = os.Getenv("MP_AUTH_FILE") + } // deprecated 2022/08/06 if len(os.Getenv("MP_SSL_CERT")) > 0 { config.UISSLCert = os.Getenv("MP_SSL_CERT") @@ -101,12 +109,6 @@ func init() { if len(os.Getenv("MP_SSL_KEY")) > 0 { config.UISSLKey = os.Getenv("MP_SSL_KEY") } - if len(os.Getenv("MP_UI_SSL_CERT")) > 0 { - config.UISSLCert = os.Getenv("MP_UI_SSL_CERT") - } - if len(os.Getenv("MP_UISSL_KEY")) > 0 { - config.UISSLKey = os.Getenv("MP_UI_SSL_KEY") - } rootCmd.Flags().StringVarP(&config.DataDir, "data", "d", config.DataDir, "Optional path to store peristent data") rootCmd.Flags().StringVarP(&config.SMTPListen, "smtp", "s", config.SMTPListen, "SMTP bind interface and port")