diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 14:06:02 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 14:06:02 -0700 |
| commit | 4f321383b33ab805f22e7172a54925b1cd353fcb (patch) | |
| tree | 81dbd0edc47cb6837e8c97bb2c5cb0034da08498 | |
| parent | 19e9a4121820a1ad124a4189837c8c4088c33439 (diff) | |
| parent | 400f55105f0e44183b3d2716917a2bc6de70697c (diff) | |
| download | chat-4f321383b33ab805f22e7172a54925b1cd353fcb.tar.gz chat-4f321383b33ab805f22e7172a54925b1cd353fcb.tar.bz2 chat-4f321383b33ab805f22e7172a54925b1cd353fcb.zip | |
Merge pull request #12 from mattermost/master
to me
| -rw-r--r-- | config/config_docker.json | 2 | ||||
| -rw-r--r-- | utils/config.go | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/config/config_docker.json b/config/config_docker.json index f2e56bef8..a90722a1d 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -58,7 +58,7 @@ "SMTPPassword": "", "SMTPServer": "localhost:25", "UseTLS": false, - "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com", + "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", "ApplePushCertPublic": "", diff --git a/utils/config.go b/utils/config.go index 418041706..23bd3e85a 100644 --- a/utils/config.go +++ b/utils/config.go @@ -6,6 +6,7 @@ package utils import ( l4g "code.google.com/p/log4go" "encoding/json" + "net/mail" "os" "path/filepath" ) @@ -222,15 +223,20 @@ func LoadConfig(fileName string) { config.ServiceSettings.Domain = os.Getenv("MATTERMOST_DOMAIN") } - // Validates our mail settings - if err := CheckMailSettings(); err != nil { - l4g.Error("Email settings are not valid err=%v", err) + // Check for a valid email for feedback, if not then do feedback@domain + if _, err := mail.ParseAddress(config.EmailSettings.FeedbackEmail); err != nil { + config.EmailSettings.FeedbackEmail = "feedback@" + config.ServiceSettings.Domain } configureLog(config.LogSettings) Cfg = &config SanitizeOptions = getSanitizeOptions() + + // Validates our mail settings + if err := CheckMailSettings(); err != nil { + l4g.Error("Email settings are not valid err=%v", err) + } } func getSanitizeOptions() map[string]bool { |