diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-06-16 17:05:23 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-06-16 17:05:23 -0400 |
| commit | bc8d9ac59949e3b1152e5876e1c67800ef15e299 (patch) | |
| tree | 2e6199ba61c924791179df48d57abf57d192a6ce /utils/config.go | |
| parent | c556bf3fbae5fab2ce91809aa9956683154a24bb (diff) | |
| download | chat-bc8d9ac59949e3b1152e5876e1c67800ef15e299.tar.gz chat-bc8d9ac59949e3b1152e5876e1c67800ef15e299.tar.bz2 chat-bc8d9ac59949e3b1152e5876e1c67800ef15e299.zip | |
Allow for setting of domain with enviroment variable
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 76e6060be..745887c70 100644 --- a/utils/config.go +++ b/utils/config.go @@ -217,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 |