diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-02-08 07:34:39 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-02-08 07:34:39 -0500 |
commit | be70bbc2f027bcc32d54e03c6b66f7e3aadec425 (patch) | |
tree | 02cbf3694b44045422b46fdb90a4b272c1fad976 /model | |
parent | 9b35fb5fa59099fe644a1b1ef3734b09b50f98bf (diff) | |
parent | 9f5f18a93a6db2b9c1089862fb68c2ee33e634ca (diff) | |
download | chat-be70bbc2f027bcc32d54e03c6b66f7e3aadec425.tar.gz chat-be70bbc2f027bcc32d54e03c6b66f7e3aadec425.tar.bz2 chat-be70bbc2f027bcc32d54e03c6b66f7e3aadec425.zip |
Merge pull request #2083 from mattermost/plt-1879
PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix deleteā¦
Diffstat (limited to 'model')
-rw-r--r-- | model/config.go | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/model/config.go b/model/config.go index acb525abf..aa3dd3586 100644 --- a/model/config.go +++ b/model/config.go @@ -24,26 +24,27 @@ const ( ) type ServiceSettings struct { - 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 + 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 + EnableInsecureOutgoingConnections *bool + SessionLengthWebInDays *int + SessionLengthMobileInDays *int + SessionLengthSSOInDays *int + SessionCacheInMinutes *int + WebsocketSecurePort *int + WebsocketPort *int } type SSOSettings struct { @@ -164,7 +165,7 @@ type LdapSettings struct { UsernameAttribute *string IdAttribute *string - // Advansed + // Advanced QueryTimeout *int } @@ -252,6 +253,11 @@ func (o *Config) SetDefaults() { *o.ServiceSettings.EnableSecurityFixAlert = true } + if o.ServiceSettings.EnableInsecureOutgoingConnections == nil { + o.ServiceSettings.EnableInsecureOutgoingConnections = new(bool) + *o.ServiceSettings.EnableInsecureOutgoingConnections = false + } + if o.TeamSettings.RestrictTeamNames == nil { o.TeamSettings.RestrictTeamNames = new(bool) *o.TeamSettings.RestrictTeamNames = true |