summaryrefslogtreecommitdiffstats
path: root/model/config.go
diff options
context:
space:
mode:
Diffstat (limited to 'model/config.go')
-rw-r--r--model/config.go15
1 files changed, 15 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go
index 1d5e06fca..5cc2488e0 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1295,6 +1295,9 @@ type SamlSettings struct {
IdpDescriptorUrl *string
AssertionConsumerServiceURL *string
+ ScopingIDPProviderId *string
+ ScopingIDPName *string
+
IdpCertificateFile *string
PublicCertificateFile *string
PrivateKeyFile *string
@@ -1701,6 +1704,16 @@ func (s *MessageExportSettings) SetDefaults() {
}
}
+type TimezoneSettings struct {
+ SupportedTimezonesPath *string
+}
+
+func (s *TimezoneSettings) SetDefaults() {
+ if s.SupportedTimezonesPath == nil {
+ s.SupportedTimezonesPath = NewString("timezones.json")
+ }
+}
+
type ConfigFunc func() *Config
type Config struct {
@@ -1734,6 +1747,7 @@ type Config struct {
MessageExportSettings MessageExportSettings
JobSettings JobSettings
PluginSettings PluginSettings
+ TimezoneSettings TimezoneSettings
}
func (o *Config) Clone() *Config {
@@ -1803,6 +1817,7 @@ func (o *Config) SetDefaults() {
o.JobSettings.SetDefaults()
o.WebrtcSettings.SetDefaults()
o.MessageExportSettings.SetDefaults()
+ o.TimezoneSettings.SetDefaults()
}
func (o *Config) IsValid() *AppError {