From 9925d52d9c75c7a4e2b1220d8fa7fd055870c0e4 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 15 Jun 2015 11:14:26 -0400 Subject: Modifying sendmail to allow for non-encrypted connection for ease setup of local mail sender --- config/config.json | 1 + 1 file changed, 1 insertion(+) (limited to 'config/config.json') diff --git a/config/config.json b/config/config.json index 4eab907f7..955947a83 100644 --- a/config/config.json +++ b/config/config.json @@ -57,6 +57,7 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", + "UseTLS": true, "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com", "FeedbackName": "", "ApplePushServer": "", -- cgit v1.2.3-1-g7c22 From e022e87b663c330cfb2595aa875cf6dad76f4dd2 Mon Sep 17 00:00:00 2001 From: Christopher Speller 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 From 7d14343634aa0cc8b3990f806d1d3c9ed214e140 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 16 Jun 2015 22:54:56 -0800 Subject: changing port back --- config/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/config.json') diff --git a/config/config.json b/config/config.json index 5bd66e8be..80431c9de 100644 --- a/config/config.json +++ b/config/config.json @@ -13,7 +13,7 @@ "Mode" : "prod", "AllowTesting" : false, "UseSSL": false, - "Port": "80", + "Port": "8065", "Version": "developer", "Shards": { }, -- cgit v1.2.3-1-g7c22 From b41925da310aa717fb6100fcc498adc8f3176c30 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 16 Jun 2015 23:05:37 -0800 Subject: Fixing build --- config/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/config.json') diff --git a/config/config.json b/config/config.json index 80431c9de..3d2c26716 100644 --- a/config/config.json +++ b/config/config.json @@ -10,7 +10,7 @@ "ServiceSettings": { "SiteName": "Mattermost Preview", "Domain": "", - "Mode" : "prod", + "Mode" : "dev", "AllowTesting" : false, "UseSSL": false, "Port": "8065", -- cgit v1.2.3-1-g7c22 From 8789b111033924e7b17d01801d02fc3b387d203d Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 17 Jun 2015 08:39:33 -0400 Subject: Resurrecting config_docker.json. Moving docker related files to docker directory. Added copyright info. --- config/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/config.json') 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": "", -- cgit v1.2.3-1-g7c22