summaryrefslogtreecommitdiffstats
path: root/config/config_docker.json
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-07-21 10:47:46 -0800
committerCorey Hulen <corey@hulen.com>2015-07-21 10:47:46 -0800
commitbee26e3f2654ce7acce647818847480569236343 (patch)
treead9032009e18b78c3ffca6e9e48fc4467ddd282b /config/config_docker.json
parentdc250d77310e8b38b445bcaa4ae8f2d5df97cc1e (diff)
parentc6fb95912bb481791c1ca370a46a4da9c05d05ad (diff)
downloadchat-bee26e3f2654ce7acce647818847480569236343.tar.gz
chat-bee26e3f2654ce7acce647818847480569236343.tar.bz2
chat-bee26e3f2654ce7acce647818847480569236343.zip
Merge pull request #200 from mattermost/mm-1356
MM-1356 Changing team URLs from team.domain.com to domain.com/team
Diffstat (limited to 'config/config_docker.json')
-rw-r--r--config/config_docker.json7
1 files changed, 1 insertions, 6 deletions
diff --git a/config/config_docker.json b/config/config_docker.json
index 185e9f215..9be837072 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,
@@ -35,11 +34,7 @@
"S3AccessKeyId": "",
"S3SecretAccessKey": "",
"S3Bucket": "",
- "S3Region": "",
- "Route53AccessKeyId": "",
- "Route53SecretAccessKey": "",
- "Route53ZoneId": "",
- "Route53Region": ""
+ "S3Region": ""
},
"ImageSettings": {
"ThumbnailWidth": 200,