go/mailpit
1
0
Fork 0
mirror of https://github.com/axllent/mailpit.git synced 2025-03-19 21:28:07 +02:00
Code Issues Releases Activity

Bugfix: Fix env variable for MP_UI_SSL_KEY

Browse Source
This commit is contained in:
Ralph Slooten 2022-08-06 23:08:34 +12:00
parent ec5267f5a5
commit a3b92711a9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/root.go
View File

@ -84,15 +84,23 @@ func init() {
if len(os.Getenv("MP_MAX_MESSAGES")) > 0 { if len(os.Getenv("MP_MAX_MESSAGES")) > 0 {
config.MaxMessages, _ = strconv.Atoi(os.Getenv("MP_MAX_MESSAGES")) 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 { if len(os.Getenv("MP_UI_AUTH_FILE")) > 0 {
config.UIAuthFile = os.Getenv("MP_UI_AUTH_FILE") config.UIAuthFile = os.Getenv("MP_UI_AUTH_FILE")
} }
if len(os.Getenv("MP_SMTP_AUTH_FILE")) > 0 { if len(os.Getenv("MP_SMTP_AUTH_FILE")) > 0 {
config.SMTPAuthFile = os.Getenv("MP_SMTP_AUTH_FILE") 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 // deprecated 2022/08/06
if len(os.Getenv("MP_SSL_CERT")) > 0 { if len(os.Getenv("MP_SSL_CERT")) > 0 {
config.UISSLCert = os.Getenv("MP_SSL_CERT") config.UISSLCert = os.Getenv("MP_SSL_CERT")
@ -101,12 +109,6 @@ func init() {
if len(os.Getenv("MP_SSL_KEY")) > 0 { if len(os.Getenv("MP_SSL_KEY")) > 0 {
config.UISSLKey = os.Getenv("MP_SSL_KEY") 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.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") rootCmd.Flags().StringVarP(&config.SMTPListen, "smtp", "s", config.SMTPListen, "SMTP bind interface and port")