diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
commit | 5fa1b3581955761bd39c310bc88b1489d963a9fc (patch) | |
tree | 25e6dd11592102807abebbb5de100f7d867005d8 /model/config.go | |
parent | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (diff) | |
parent | 87762ae62eb887dfb3fd0957040919aede46f7d4 (diff) | |
download | chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.gz chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.bz2 chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.zip |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'model/config.go')
-rw-r--r-- | model/config.go | 15 |
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 { |