From e022e87b663c330cfb2595aa875cf6dad76f4dd2 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Tue, 16 Jun 2015 19:46:56 -0400
Subject: Using config.json instead of config_docker.json for docker. Note,
 this will break local dev builds.

---
 config/config.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'config/config.json')

diff --git a/config/config.json b/config/config.json
index c75f2f15a..5bd66e8be 100644
--- a/config/config.json
+++ b/config/config.json
@@ -8,12 +8,12 @@
         "FileLocation": ""
     },
     "ServiceSettings": {
-        "SiteName": "XXXXXXMustBeFilledIn",
-        "Domain": "xxxxxxmustbefilledin.com",
-        "Mode" : "dev",
+        "SiteName": "Mattermost Preview",
+        "Domain": "",
+        "Mode" : "prod",
 		"AllowTesting" : false,
         "UseSSL": false,
-        "Port": "8065",
+        "Port": "80",
         "Version": "developer",
         "Shards": {
         },
@@ -56,8 +56,8 @@
     "EmailSettings": {
         "SMTPUsername": "",
         "SMTPPassword": "",
-        "SMTPServer": "",
-		"UseTLS": true,
+        "SMTPServer": "localhost:25",
+		"UseTLS": false,
         "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
         "FeedbackName": "",
         "ApplePushServer": "",
-- 
cgit v1.2.3-1-g7c22