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 | eec8c349e3aac87e54a053a59b9655171cfccb8c (patch) | |
tree | 31a4a70664b688f0d1eba993f4305d2458543ddb | |
parent | 64caa7453f69a1125eedf107ce1275d99471dfca (diff) | |
parent | bc8d9ac59949e3b1152e5876e1c67800ef15e299 (diff) | |
download | chat-eec8c349e3aac87e54a053a59b9655171cfccb8c.tar.gz chat-eec8c349e3aac87e54a053a59b9655171cfccb8c.tar.bz2 chat-eec8c349e3aac87e54a053a59b9655171cfccb8c.zip |
Merge pull request #15 from mattermost/enviroment-override
Allow for setting of domain with enviroment variable
-rw-r--r-- | utils/config.go | 5 | ||||
-rw-r--r-- | utils/config_test.go | 15 |
2 files changed, 20 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 diff --git a/utils/config_test.go b/utils/config_test.go index 4d37b4e88..9067dc647 100644 --- a/utils/config_test.go +++ b/utils/config_test.go @@ -4,9 +4,24 @@ package utils import ( + "os" "testing" ) func TestConfig(t *testing.T) { LoadConfig("config.json") } + +func TestEnvOverride(t *testing.T) { + os.Setenv("MATTERMOST_DOMAIN", "testdomain.com") + + LoadConfig("config_docker.json") + if Cfg.ServiceSettings.Domain != "testdomain.com" { + t.Fail() + } + + LoadConfig("config.json") + if Cfg.ServiceSettings.Domain == "testdomain.com" { + t.Fail() + } +} |