Merge pull request #1 from rgarmsen2295/mm-1253

MM-1253

1 files changed, 11 insertions, 0 deletions

diff --git a/utils/config.go b/utils/config.go
index 1060c7550..418041706 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -79,6 +79,7 @@ type EmailSettings struct {
 	SMTPUsername         string
 	SMTPPassword         string
 	SMTPServer           string
+	UseTLS               bool
 	FeedbackEmail        string
 	FeedbackName         string
 	ApplePushServer      string
@@ -216,6 +217,16 @@ func LoadConfig(fileName string) {
 		panic("Error decoding configuration " + err.Error())
 	}
 
+	// Grabs the domain from enviroment variable if not in configuration
+	if config.ServiceSettings.Domain == "" {
+		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)
+	}
+
 	configureLog(config.LogSettings)
 
 	Cfg = &config