diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-22 18:05:44 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-22 18:05:44 -0800 |
| commit | c277a98b5d88c81df39f8e33ef1286f72ac04014 (patch) | |
| tree | 0d96238a2ee3ab121ea576db9900311ff5a57ba6 /config | |
| parent | e0bad6c03784d44210760577550be585daf513b9 (diff) | |
| parent | f4c3eaa8c091366a956fa2ab48124190f4f9082b (diff) | |
| download | chat-c277a98b5d88c81df39f8e33ef1286f72ac04014.tar.gz chat-c277a98b5d88c81df39f8e33ef1286f72ac04014.tar.bz2 chat-c277a98b5d88c81df39f8e33ef1286f72ac04014.zip | |
Merge branch 'master' into mm-1420
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 4 | ||||
| -rw-r--r-- | config/config_docker.json | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json index e6025ef51..085dd6de6 100644 --- a/config/config.json +++ b/config/config.json @@ -19,7 +19,9 @@ "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6", "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", - "AnalyticsUrl": "" + "AnalyticsUrl": "", + "UseLocalStorage": true, + "StorageDirectory": "./data/" }, "SqlSettings": { "DriverName": "mysql", diff --git a/config/config_docker.json b/config/config_docker.json index 9be837072..062cdef65 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -19,7 +19,9 @@ "InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6", "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4", "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", - "AnalyticsUrl": "" + "AnalyticsUrl": "", + "UseLocalStorage": true, + "StorageDirectory": "/mattermost/data/" }, "SqlSettings": { "DriverName": "mysql", |