diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-06-19 09:52:04 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-06-19 09:52:04 -0400 |
| commit | 634d29feadd6602895c595e791cd53f81eea41ff (patch) | |
| tree | 48002efc90d4e3e1ce0a92d80927fb9758de2ec3 | |
| parent | 5ca9397c3ca4a34b4e5546deec03d6c1fe967b43 (diff) | |
| download | chat-634d29feadd6602895c595e791cd53f81eea41ff.tar.gz chat-634d29feadd6602895c595e791cd53f81eea41ff.tar.bz2 chat-634d29feadd6602895c595e791cd53f81eea41ff.zip | |
Defaulting to domain of localhost when no domain is given
| -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 |