diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-19 08:06:25 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-19 08:06:25 -0700 |
| commit | c1740ffa2fcfcf663d8e847cfe03187fb600b6c1 (patch) | |
| tree | 1077544c0d976e274bdb5852fdf0ed548d6bd493 /utils | |
| parent | 4f321383b33ab805f22e7172a54925b1cd353fcb (diff) | |
| parent | 8dab13c7ded5ca04e06b68146dbd8c34fb997763 (diff) | |
| download | chat-c1740ffa2fcfcf663d8e847cfe03187fb600b6c1.tar.gz chat-c1740ffa2fcfcf663d8e847cfe03187fb600b6c1.tar.bz2 chat-c1740ffa2fcfcf663d8e847cfe03187fb600b6c1.zip | |
Merge pull request #14 from mattermost/master
to me
Diffstat (limited to 'utils')
| -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 |