Merge pull request #20 from mattermost/docker-tweaks

MM-1157 Various tweaks to docker requested. HELIUM

3 files changed, 87 insertions, 43 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": "",
diff --git a/config/config_docker.json b/config/config_docker.json
new file mode 100644
index 000000000..f2e56bef8
--- /dev/null
+++ b/config/config_docker.json
@@ -0,0 +1,85 @@
+{
+    "LogSettings": {
+        "ConsoleEnable": false,
+        "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": "gxHVDcKUyP2y1eiyW8S8na1UYQAfq6J6",
+        "PublicLinkSalt": "TO3pTyXIZzwHiwyZgGql7lM7DG3zeId4",
+        "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t",
+        "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": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS"
+    },
+    "RedisSettings": {
+        "DataSource": "localhost:6379",
+        "MaxOpenConns": 1000
+    },
+    "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@xxxxxxmustbefilledin.com",
+        "FeedbackName": "",
+        "ApplePushServer": "",
+        "ApplePushCertPublic": "",
+        "ApplePushCertPrivate": ""
+    },
+    "PrivacySettings": {
+        "ShowEmailAddress": true,
+        "ShowPhoneNumber": true,
+        "ShowSkypeId": true,
+        "ShowFullName": true
+    },
+    "TeamSettings": {
+        "MaxUsersPerTeam": 150,
+        "AllowPublicLink": true,
+        "AllowValet": false,
+        "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"
+    }
+}
diff --git a/config/main.cf b/config/main.cf
deleted file mode 100644
index 72eba333f..000000000
--- a/config/main.cf
+++ /dev/null
@@ -1,41 +0,0 @@
-# See /usr/share/postfix/main.cf.dist for a commented, more complete version
-
-
-# Debian specific:  Specifying a file name will cause the first
-# line of that file to be used as the name.  The Debian default
-# is /etc/mailname.
-myorigin = mattermost.com
-myhostname = mattermost.com
-
-smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu)
-biff = no
-
-# appending .domain is the MUA's job.
-append_dot_mydomain = no
-
-# Uncomment the next line to generate "delayed mail" warnings
-#delay_warning_time = 4h
-
-readme_directory = no
-
-# TLS parameters
-smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
-smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
-smtpd_use_tls=no
-smtp_use_tls=no
-smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
-smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
-
-# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
-# information on enabling SSL in the smtp client.
-
-smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-mydestination = localhost, localhost.localdomain, localhost
-relayhost = 
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
-mailbox_size_limit = 0
-recipient_delimiter = +
-inet_interfaces = all
-inet_protocols = all