diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-22 16:31:58 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-22 16:31:58 -0600 |
| commit | c2d98c2c1f4860c11aedf43aff5e360256a89835 (patch) | |
| tree | 4304f7584025477d74e5e70677c4f5a70c26bb58 /model/config.go | |
| parent | 6e2c1b7fd5248c6a4a91edcd59fa124c8d3c744a (diff) | |
| parent | d352c5b64dddfb8e46b18edbd7352c41495078a1 (diff) | |
| download | chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.gz chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.bz2 chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.zip | |
merging
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index 7d9ff41f1..c0e66d50c 100644 --- a/model/config.go +++ b/model/config.go @@ -42,6 +42,8 @@ type ServiceSettings struct { SessionLengthMobileInDays *int SessionLengthSSOInDays *int SessionCacheInMinutes *int + WebsocketSecurePort *int + WebsocketPort *int } type SSOSettings struct { @@ -342,6 +344,16 @@ func (o *Config) SetDefaults() { o.ServiceSettings.EnableOnlyAdminIntegrations = new(bool) *o.ServiceSettings.EnableOnlyAdminIntegrations = true } + + if o.ServiceSettings.WebsocketPort == nil { + o.ServiceSettings.WebsocketPort = new(int) + *o.ServiceSettings.WebsocketPort = 80 + } + + if o.ServiceSettings.WebsocketSecurePort == nil { + o.ServiceSettings.WebsocketSecurePort = new(int) + *o.ServiceSettings.WebsocketSecurePort = 443 + } } func (o *Config) IsValid() *AppError { |