summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-06-17 10:02:29 -0800
committerCorey Hulen <corey@hulen.com>2015-06-17 10:02:29 -0800
commit7455f2621a4d03133edaaf5d52f71173b315b2a7 (patch)
treeebb842e66ece35771ed86416db4d03ca4a7decd3 /config/config.json
parent0d6ed4a6ab14c4fc4bbdf4bd0b63c19d896a7b48 (diff)
parentfd4b0d4aa30d36e34e7d6a6810de397c4126e76f (diff)
downloadchat-7455f2621a4d03133edaaf5d52f71173b315b2a7.tar.gz
chat-7455f2621a4d03133edaaf5d52f71173b315b2a7.tar.bz2
chat-7455f2621a4d03133edaaf5d52f71173b315b2a7.zip
Merge pull request #20 from mattermost/docker-tweaks
MM-1157 Various tweaks to docker requested. HELIUM
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json
index 3d2c26716..1b844c259 100644
--- a/config/config.json
+++ b/config/config.json
@@ -9,7 +9,7 @@
},
"ServiceSettings": {
"SiteName": "Mattermost Preview",
- "Domain": "",
+ "Domain": "xxxxxxmustbefilledin.com",
"Mode" : "dev",
"AllowTesting" : false,
"UseSSL": false,
@@ -56,7 +56,7 @@
"EmailSettings": {
"SMTPUsername": "",
"SMTPPassword": "",
- "SMTPServer": "localhost:25",
+ "SMTPServer": "",
"UseTLS": false,
"FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
"FeedbackName": "",