diff options
author | =Corey Hulen <corey@hulen.com> | 2016-02-04 10:55:44 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-02-04 10:55:44 -0800 |
commit | cfd4e4de963703191e750ba0abb901c5f6c0c3e4 (patch) | |
tree | d01a656eeeaba9603568a54a164f378608c4a939 /model/config.go | |
parent | f1bf70624288bd192b9523764f239eee2a022304 (diff) | |
parent | 44c19ee443831e0e94b5738ecb21a64ce7643247 (diff) | |
download | chat-cfd4e4de963703191e750ba0abb901c5f6c0c3e4.tar.gz chat-cfd4e4de963703191e750ba0abb901c5f6c0c3e4.tar.bz2 chat-cfd4e4de963703191e750ba0abb901c5f6c0c3e4.zip |
Merge branch 'master' into PLT-1851
Diffstat (limited to 'model/config.go')
-rw-r--r-- | model/config.go | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/model/config.go b/model/config.go index a6d1c21dc..acb525abf 100644 --- a/model/config.go +++ b/model/config.go @@ -24,24 +24,26 @@ const ( ) type ServiceSettings struct { - ListenAddress string - MaximumLoginAttempts int - SegmentDeveloperKey string - GoogleDeveloperKey string - EnableOAuthServiceProvider bool - EnableIncomingWebhooks bool - EnableOutgoingWebhooks bool - EnablePostUsernameOverride bool - EnablePostIconOverride bool - EnableTesting bool - EnableDeveloper *bool - EnableSecurityFixAlert *bool - SessionLengthWebInDays *int - SessionLengthMobileInDays *int - SessionLengthSSOInDays *int - SessionCacheInMinutes *int - WebsocketSecurePort *int - WebsocketPort *int + ListenAddress string + MaximumLoginAttempts int + SegmentDeveloperKey string + GoogleDeveloperKey string + EnableOAuthServiceProvider bool + EnableIncomingWebhooks bool + EnableOutgoingWebhooks bool + EnableCommands *bool + EnableOnlyAdminIntegrations *bool + EnablePostUsernameOverride bool + EnablePostIconOverride bool + EnableTesting bool + EnableDeveloper *bool + EnableSecurityFixAlert *bool + SessionLengthWebInDays *int + SessionLengthMobileInDays *int + SessionLengthSSOInDays *int + SessionCacheInMinutes *int + WebsocketSecurePort *int + WebsocketPort *int } type SSOSettings struct { @@ -349,10 +351,22 @@ func (o *Config) SetDefaults() { o.ServiceSettings.SessionCacheInMinutes = new(int) *o.ServiceSettings.SessionCacheInMinutes = 10 } + + if o.ServiceSettings.EnableCommands == nil { + o.ServiceSettings.EnableCommands = new(bool) + *o.ServiceSettings.EnableCommands = false + } + + if o.ServiceSettings.EnableOnlyAdminIntegrations == nil { + 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 |