diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-07-08 11:50:10 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-07-20 17:45:23 -0400 |
| commit | c6fb95912bb481791c1ca370a46a4da9c05d05ad (patch) | |
| tree | bb33ff7b494b45c9d95c15f290d97914e911ce91 /config | |
| parent | a1876cf6cc827743d8687a9113b727ef7190f452 (diff) | |
| download | chat-c6fb95912bb481791c1ca370a46a4da9c05d05ad.tar.gz chat-c6fb95912bb481791c1ca370a46a4da9c05d05ad.tar.bz2 chat-c6fb95912bb481791c1ca370a46a4da9c05d05ad.zip | |
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
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.json | 7 | ||||
| -rw-r--r-- | config/config_docker.json | 7 |
2 files changed, 2 insertions, 12 deletions
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, |