diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-06-19 10:07:15 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-06-19 10:07:15 -0400 |
| commit | 517581c30507afa2181199b0936bd9f51eae7513 (patch) | |
| tree | 0c2af22bf803821b6d35bd0e179d7b1c3af3ea96 | |
| parent | 19fd5afff017741f43a26fd865054fc97b2f80d5 (diff) | |
| parent | 00275cc90569a05fc158fa9355b58550034bdcbb (diff) | |
| download | chat-517581c30507afa2181199b0936bd9f51eae7513.tar.gz chat-517581c30507afa2181199b0936bd9f51eae7513.tar.bz2 chat-517581c30507afa2181199b0936bd9f51eae7513.zip | |
Merge pull request #38 from mattermost/feedback-email-fix
Defaulting to domain of localhost when no domain is given HELIUM
| -rw-r--r-- | utils/config.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 23bd3e85a..6a7e4589c 100644 --- a/utils/config.go +++ b/utils/config.go @@ -221,6 +221,10 @@ func LoadConfig(fileName string) { // Grabs the domain from enviroment variable if not in configuration if config.ServiceSettings.Domain == "" { config.ServiceSettings.Domain = os.Getenv("MATTERMOST_DOMAIN") + // If the enviroment variable is not set, use a default + if config.ServiceSettings.Domain == "" { + config.ServiceSettings.Domain = "localhost" + } } // Check for a valid email for feedback, if not then do feedback@domain |