From c6fb95912bb481791c1ca370a46a4da9c05d05ad Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 8 Jul 2015 11:50:10 -0400
Subject: Changing the way we mattermost handles URLs. team.domain.com becomes
 domain.com/team. Renaming team.Name to team.DisplayName and team.Domain to
 team.Name. So: team.Name -> url safe name. team.DisplayName -> nice name for
 users

---
 config/config.json        | 7 +------
 config/config_docker.json | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'config')

diff --git a/config/config.json b/config/config.json
index 27ca57e86..e6025ef51 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,
@@ -35,11 +34,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..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,
-- 
cgit v1.2.3-1-g7c22