diff options
| author | Corey Hulen <corey@hulen.com> | 2016-03-17 13:16:10 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-03-17 13:16:10 -0700 |
| commit | 53d7718e57d4225eb5c020324d32cbe5b5eca7ad (patch) | |
| tree | 9e549812c250513d56dd631c65c49402ea549ff7 /config | |
| parent | 8d571ee498c97128bd797f8ac1cb4c3c995fb875 (diff) | |
| parent | 2e5cc29738340c7330d1b2606ceba40865872e4c (diff) | |
| download | chat-53d7718e57d4225eb5c020324d32cbe5b5eca7ad.tar.gz chat-53d7718e57d4225eb5c020324d32cbe5b5eca7ad.tar.bz2 chat-53d7718e57d4225eb5c020324d32cbe5b5eca7ad.zip | |
Merge pull request #2442 from mattermost/PLT-2115
PLT-2115 adding compliance feature
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/config/config.json b/config/config.json index a0b50cbf2..1735ca293 100644 --- a/config/config.json +++ b/config/config.json @@ -129,16 +129,21 @@ }, "LdapSettings": { "Enable": false, - "LdapServer": null, + "LdapServer": "", "LdapPort": 389, - "BaseDN": null, - "BindUsername": null, - "BindPassword": null, - "FirstNameAttribute": null, - "LastNameAttribute": null, - "EmailAttribute": null, - "UsernameAttribute": null, - "IdAttribute": null, + "BaseDN": "", + "BindUsername": "", + "BindPassword": "", + "FirstNameAttribute": "", + "LastNameAttribute": "", + "EmailAttribute": "", + "UsernameAttribute": "", + "IdAttribute": "", "QueryTimeout": 60 + }, + "ComplianceSettings": { + "Enable": false, + "Directory": "./data/", + "EnableDaily": false } } |