diff options
| author | Corey Hulen <corey@hulen.com> | 2015-06-16 13:50:22 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-06-16 13:50:22 -0800 |
| commit | 89cedbcce2ce0857ffde620951ed4d582e0a0829 (patch) | |
| tree | c19ed17c9f6074f3e96c2613aad49ce9a8fbdbab /utils/config.go | |
| parent | aba929490842c7ec4817c5ff45df02b06bdf6028 (diff) | |
| parent | d4c7e8e2653893d885b581f3fd98d31b84fe0ef4 (diff) | |
| download | chat-89cedbcce2ce0857ffde620951ed4d582e0a0829.tar.gz chat-89cedbcce2ce0857ffde620951ed4d582e0a0829.tar.bz2 chat-89cedbcce2ce0857ffde620951ed4d582e0a0829.zip | |
Merge pull request #15 from mattermost/enviroment-override
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 |