From 36b17bf99ddd35c0c223722f8b6f4f1c71b2235e Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 14 Mar 2016 16:07:58 -0700
Subject: PLT-2115 Adding compliance

---
 config/config.json | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/config.json b/config/config.json
index b211b16d3..5ed5d61bc 100644
--- a/config/config.json
+++ b/config/config.json
@@ -19,7 +19,9 @@
         "SessionLengthWebInDays": 30,
         "SessionLengthMobileInDays": 30,
         "SessionLengthSSOInDays": 30,
-        "SessionCacheInMinutes": 10
+        "SessionCacheInMinutes": 10,
+        "WebsocketSecurePort": 443,
+        "WebsocketPort": 80
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
@@ -113,5 +115,33 @@
         "AuthEndpoint": "",
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
+    },
+    "GoogleSettings": {
+        "Enable": false,
+        "Secret": "",
+        "Id": "",
+        "Scope": "",
+        "AuthEndpoint": "",
+        "TokenEndpoint": "",
+        "UserApiEndpoint": ""
+    },
+    "LdapSettings": {
+        "Enable": false,
+        "LdapServer": "",
+        "LdapPort": 389,
+        "BaseDN": "",
+        "BindUsername": "",
+        "BindPassword": "",
+        "FirstNameAttribute": "",
+        "LastNameAttribute": "",
+        "EmailAttribute": "",
+        "UsernameAttribute": "",
+        "IdAttribute": "",
+        "QueryTimeout": 60
+    },
+    "ComplianceSettings": {
+        "Enable": true,
+        "Directory": "./data/",
+        "EnableDaily": false
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22


From ae2e80148ee80422d06a9a82569f0188800ad065 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 15 Mar 2016 18:30:41 -0700
Subject: Fixing config file

---
 config/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.json b/config/config.json
index 5ed5d61bc..8b58e64e4 100644
--- a/config/config.json
+++ b/config/config.json
@@ -140,7 +140,7 @@
         "QueryTimeout": 60
     },
     "ComplianceSettings": {
-        "Enable": true,
+        "Enable": false,
         "Directory": "./data/",
         "EnableDaily": false
     }
-- 
cgit v1.2.3-1-g7c22