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 | 0355291396809524bbd072aa8b80b6be94ea0fc3 (patch) | |
| tree | cbb8d1bf93d2d24d197533bc4d90cce5bdf90496 | |
| parent | ff07cd4e871b1ed4457a70409c2d290f6ee47c6b (diff) | |
| parent | 6e0a92a1a36e8819c471bae88af23d128691f8bc (diff) | |
| download | chat-0355291396809524bbd072aa8b80b6be94ea0fc3.tar.gz chat-0355291396809524bbd072aa8b80b6be94ea0fc3.tar.bz2 chat-0355291396809524bbd072aa8b80b6be94ea0fc3.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 |