Merge pull request #2442 from mattermost/PLT-2115

PLT-2115 adding compliance feature

1 files changed, 34 insertions, 12 deletions

diff --git a/model/config.go b/model/config.go
index d684c72b2..3ca241275 100644
--- a/model/config.go
+++ b/model/config.go
@@ -179,19 +179,26 @@ type LdapSettings struct {
 	QueryTimeout *int
 }
 
+type ComplianceSettings struct {
+	Enable      *bool
+	Directory   *string
+	EnableDaily *bool
+}
+
 type Config struct {
-	ServiceSettings   ServiceSettings
-	TeamSettings      TeamSettings
-	SqlSettings       SqlSettings
-	LogSettings       LogSettings
-	FileSettings      FileSettings
-	EmailSettings     EmailSettings
-	RateLimitSettings RateLimitSettings
-	PrivacySettings   PrivacySettings
-	SupportSettings   SupportSettings
-	GitLabSettings    SSOSettings
-	GoogleSettings    SSOSettings
-	LdapSettings      LdapSettings
+	ServiceSettings    ServiceSettings
+	TeamSettings       TeamSettings
+	SqlSettings        SqlSettings
+	LogSettings        LogSettings
+	FileSettings       FileSettings
+	EmailSettings      EmailSettings
+	RateLimitSettings  RateLimitSettings
+	PrivacySettings    PrivacySettings
+	SupportSettings    SupportSettings
+	GitLabSettings     SSOSettings
+	GoogleSettings     SSOSettings
+	LdapSettings       LdapSettings
+	ComplianceSettings ComplianceSettings
 }
 
 func (o *Config) ToJson() string {
@@ -402,6 +409,21 @@ func (o *Config) SetDefaults() {
 		o.ServiceSettings.WebserverMode = new(string)
 		*o.ServiceSettings.WebserverMode = "regular"
 	}
+
+	if o.ComplianceSettings.Enable == nil {
+		o.ComplianceSettings.Enable = new(bool)
+		*o.ComplianceSettings.Enable = false
+	}
+
+	if o.ComplianceSettings.Directory == nil {
+		o.ComplianceSettings.Directory = new(string)
+		*o.ComplianceSettings.Directory = "./data/"
+	}
+
+	if o.ComplianceSettings.EnableDaily == nil {
+		o.ComplianceSettings.EnableDaily = new(bool)
+		*o.ComplianceSettings.EnableDaily = false
+	}
 }
 
 func (o *Config) IsValid() *AppError {