Using config.json instead of config_docker.json for docker. Note, this will break local dev builds.

2 files changed, 6 insertions, 90 deletions

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": "",
diff --git a/config/config_docker.json b/config/config_docker.json
deleted file mode 100644
index 761f5a8e5..000000000
--- a/config/config_docker.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "LogSettings": {
-        "ConsoleEnable": true,
-        "ConsoleLevel": "DEBUG",
-        "FileEnable": true,
-        "FileLevel": "INFO",
-        "FileFormat": "",
-        "FileLocation": ""
-    },
-    "ServiceSettings": {
-        "SiteName": "Mattermost Preview",
-        "Domain": "",
-        "Mode" : "prod",
-		"AllowTesting" : false,
-        "UseSSL": false,
-        "Port": "80",
-        "Version": "developer",
-        "Shards": {
-        },
-        "InviteSalt": "4nAN4CuEJQ4G73RPA9DJrcVkbrGIE9SX",
-        "PublicLinkSalt": "zBXCZvnXQ5aRfzqPHgrK5G6wunsPzimE",
-        "ResetSalt": "GcloaPC5tjGCzwXApNJ23oSLUoP8LXQ4",
-        "AnalyticsUrl": ""
-    },
-    "SqlSettings": {
-        "DriverName": "mysql",
-        "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test",
-        "DataSourceReplicas": ["mmuser:mostest@tcp(localhost:3306)/mattermost_test"],
-        "MaxIdleConns": 10,
-        "MaxOpenConns": 10,
-        "Trace": false,
-        "AtRestEncryptKey": "4Uuoy2t1S204JUKXHGfALJL2J5q3jlEH"
-    },
-    "RedisSettings": {
-        "DataSource": "localhost:6379",
-        "MaxOpenConns": 100
-    },
-    "AWSSettings": {
-        "S3AccessKeyId": "",
-        "S3SecretAccessKey": "",
-        "S3Bucket": "",
-        "S3Region": "",
-        "Route53AccessKeyId": "",
-        "Route53SecretAccessKey": "",
-        "Route53ZoneId": "",
-        "Route53Region": ""
-    },
-    "ImageSettings": {
-        "ThumbnailWidth": 200,
-        "ThumbnailHeight": 0,
-        "PreviewWidth": 1024,
-        "PreviewHeight": 0,
-        "ProfileWidth": 128,
-        "ProfileHeight": 128
-    },
-    "EmailSettings": {
-        "SMTPUsername": "",
-        "SMTPPassword": "",
-        "SMTPServer": "localhost:25",
-		"UseTLS": false,
-        "FeedbackEmail": "feedback@mattermost.com",
-        "FeedbackName": "",
-        "ApplePushServer": "",
-        "ApplePushCertPublic": "",
-        "ApplePushCertPrivate":""
-    },
-    "PrivacySettings": {
-        "ShowEmailAddress": false,
-        "ShowPhoneNumber": false,
-        "ShowSkypeId": false,
-        "ShowFullName": false
-    },
-    "TeamSettings": {
-        "MaxUsersPerTeam": 150,
-        "AllowPublicLink": true,
-        "TermsLink": "/static/help/configure_links.html",
-        "PrivacyLink": "/static/help/configure_links.html",
-        "AboutLink": "/static/help/configure_links.html",
-        "HelpLink": "/static/help/configure_links.html",
-        "ReportProblemLink": "/static/help/configure_links.html",
-        "TourLink": "/static/help/configure_links.html",
-        "DefaultThemeColor": "#2389D7"
-    }
-}