diff --git a/config/client.go b/config/client.go index e7f34ca0479..54b2a365297 100644 --- a/config/client.go +++ b/config/client.go @@ -47,6 +47,7 @@ func GenerateClientConfig(c *model.Config, telemetryID string, license *model.Li props["EnableMarketplace"] = strconv.FormatBool(*c.PluginSettings.EnableMarketplace) props["EnableLatex"] = strconv.FormatBool(*c.ServiceSettings.EnableLatex) props["ExtendSessionLengthWithActivity"] = strconv.FormatBool(*c.ServiceSettings.ExtendSessionLengthWithActivity) + props["ManagedResourcePaths"] = *c.ServiceSettings.ManagedResourcePaths // This setting is only temporary, so keep using the old setting name for the mobile and web apps props["ExperimentalEnablePostMetadata"] = "true" diff --git a/model/config.go b/model/config.go index c7bb8c5aefc..0d2631ba337 100644 --- a/model/config.go +++ b/model/config.go @@ -351,6 +351,7 @@ type ServiceSettings struct { FeatureFlagSyncIntervalSeconds *int `access:"environment,write_restrictable"` DebugSplit *bool `access:"environment,write_restrictable"` ThreadAutoFollow *bool `access:"experimental"` + ManagedResourcePaths *string `access:"environment,write_restrictable,cloud_restrictable"` } func (s *ServiceSettings) SetDefaults(isUpdate bool) { @@ -784,6 +785,10 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) { if s.ThreadAutoFollow == nil { s.ThreadAutoFollow = NewBool(true) } + + if s.ManagedResourcePaths == nil { + s.ManagedResourcePaths = NewString("") + } } type ClusterSettings struct {