diff options
| author | Corey Hulen <corey@hulen.com> | 2017-03-31 06:54:30 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-03-31 09:54:30 -0400 |
| commit | 00bb4799899cbbcdf48b147639dee3cee7ea199b (patch) | |
| tree | 74881150207ae980b1703644da265fed6886d65d /model | |
| parent | fa40bfb9e6f3bcdfe631301be2ee3ce755cbef0e (diff) | |
| download | chat-00bb4799899cbbcdf48b147639dee3cee7ea199b.tar.gz chat-00bb4799899cbbcdf48b147639dee3cee7ea199b.tar.bz2 chat-00bb4799899cbbcdf48b147639dee3cee7ea199b.zip | |
PLT-6090 adding ability to read license file from disk (#5895)
* PLT-6090 adding ability to read license file from disk
* Fixing unit test that fails only sometimes
* Fixing test that fails randomly
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index 4486b64ad..e26bf90f1 100644 --- a/model/config.go +++ b/model/config.go @@ -111,6 +111,7 @@ const ( type ServiceSettings struct { SiteURL *string + LicenseFileLocation *string ListenAddress string ConnectionSecurity *string TLSCertFile *string @@ -497,6 +498,10 @@ func (o *Config) SetDefaults() { *o.ServiceSettings.SiteURL = SERVICE_SETTINGS_DEFAULT_SITE_URL } + if o.ServiceSettings.LicenseFileLocation == nil { + o.ServiceSettings.LicenseFileLocation = new(string) + } + if o.ServiceSettings.EnableLinkPreviews == nil { o.ServiceSettings.EnableLinkPreviews = new(bool) *o.ServiceSettings.EnableLinkPreviews = false |