summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.json11
-rw-r--r--config/config_docker.json11
2 files changed, 8 insertions, 14 deletions
diff --git a/config/config.json b/config/config.json
index 27ca57e86..085dd6de6 100644
--- a/config/config.json
+++ b/config/config.json
@@ -9,7 +9,6 @@
},
"ServiceSettings": {
"SiteName": "Mattermost",
- "Domain": "xxxxxxmustbefilledin.com",
"Mode" : "dev",
"AllowTesting" : false,
"UseSSL": false,
@@ -20,7 +19,9 @@
"InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6",
"PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4",
"ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
- "AnalyticsUrl": ""
+ "AnalyticsUrl": "",
+ "UseLocalStorage": true,
+ "StorageDirectory": "./data/"
},
"SqlSettings": {
"DriverName": "mysql",
@@ -35,11 +36,7 @@
"S3AccessKeyId": "",
"S3SecretAccessKey": "",
"S3Bucket": "",
- "S3Region": "",
- "Route53AccessKeyId": "",
- "Route53SecretAccessKey": "",
- "Route53ZoneId": "",
- "Route53Region": ""
+ "S3Region": ""
},
"ImageSettings": {
"ThumbnailWidth": 200,
diff --git a/config/config_docker.json b/config/config_docker.json
index 185e9f215..062cdef65 100644
--- a/config/config_docker.json
+++ b/config/config_docker.json
@@ -9,7 +9,6 @@
},
"ServiceSettings": {
"SiteName": "Mattermost",
- "Domain": "",
"Mode" : "dev",
"AllowTesting" : false,
"UseSSL": false,
@@ -20,7 +19,9 @@
"InviteSalt": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6",
"PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4",
"ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
- "AnalyticsUrl": ""
+ "AnalyticsUrl": "",
+ "UseLocalStorage": true,
+ "StorageDirectory": "/mattermost/data/"
},
"SqlSettings": {
"DriverName": "mysql",
@@ -35,11 +36,7 @@
"S3AccessKeyId": "",
"S3SecretAccessKey": "",
"S3Bucket": "",
- "S3Region": "",
- "Route53AccessKeyId": "",
- "Route53SecretAccessKey": "",
- "Route53ZoneId": "",
- "Route53Region": ""
+ "S3Region": ""
},
"ImageSettings": {
"ThumbnailWidth": 200,