Merge branch 'master' into PLT-1851

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