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 | 11aebc3c72917ac85ef787c8f30f538d0c417453 (patch) | |
| tree | f53b47fa64ebad94adb8c594ee313465b84ba6ca | |
| parent | cb38322bcc157f1836b81a1a9eadcd74d07851f9 (diff) | |
| parent | 634d29feadd6602895c595e791cd53f81eea41ff (diff) | |
| download | chat-11aebc3c72917ac85ef787c8f30f538d0c417453.tar.gz chat-11aebc3c72917ac85ef787c8f30f538d0c417453.tar.bz2 chat-11aebc3c72917ac85ef787c8f30f538d0c417453.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 |