diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-17 07:54:30 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-17 07:54:30 -0700 |
| commit | cafbada5148546750ec50af8a5e754d22ebf5059 (patch) | |
| tree | 948d72720cca1a486c0e13d9b3b5c8597027451d /utils/config.go | |
| parent | a7ed61ef90492dee7f9825b5563ed575d4f60c77 (diff) | |
| parent | 5a8f8397167cec8cba29b70bb7dbdda9ba0265f7 (diff) | |
| download | chat-cafbada5148546750ec50af8a5e754d22ebf5059.tar.gz chat-cafbada5148546750ec50af8a5e754d22ebf5059.tar.bz2 chat-cafbada5148546750ec50af8a5e754d22ebf5059.zip | |
Merge pull request #3 from mattermost/master
to me
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 1060c7550..745887c70 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,11 @@ 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") + } + configureLog(config.LogSettings) Cfg = &config |