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 | 2f2aded178c161f7688f295231605711806c7f64 (patch) | |
| tree | 478036664138f16a4d72cc416320ed5a9630fd38 /utils/config.go | |
| parent | dae0340d7de308d2e6bc7145fb158635b5cdf0ca (diff) | |
| download | chat-2f2aded178c161f7688f295231605711806c7f64.tar.gz chat-2f2aded178c161f7688f295231605711806c7f64.tar.bz2 chat-2f2aded178c161f7688f295231605711806c7f64.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 |