summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Dockerfile7
-rw-r--r--config/config_docker.json7
-rw-r--r--config/main.cf41
-rwxr-xr-xdocker-entry.sh3
4 files changed, 54 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 2e2ad002d..da57550c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,9 @@ RUN apt-get install -y nodejs
RUN apt-get install -y ruby-full
RUN gem install compass
+# Postfix
+RUN apt-get install -y postfix
+
#
# Install GO
#
@@ -79,6 +82,8 @@ RUN wget http://download.redis.io/redis-stable.tar.gz; \
# Copy over files
ADD . /go/src/github.com/mattermost/platform
+# Insert postfix config
+ADD ./config/main.cf /etc/postfix/
RUN go get github.com/tools/godep
RUN cd /go/src/github.com/mattermost/platform; godep restore
@@ -89,4 +94,4 @@ RUN chmod +x /go/src/github.com/mattermost/platform/docker-entry.sh
ENTRYPOINT /go/src/github.com/mattermost/platform/docker-entry.sh
# Ports
-EXPOSE 8065
+EXPOSE 80
diff --git a/config/config_docker.json b/config/config_docker.json
index 470c41bb5..761f5a8e5 100644
--- a/config/config_docker.json
+++ b/config/config_docker.json
@@ -8,9 +8,9 @@
"FileLocation": ""
},
"ServiceSettings": {
- "SiteName": "",
+ "SiteName": "Mattermost Preview",
"Domain": "",
- "Mode" : "dev",
+ "Mode" : "prod",
"AllowTesting" : false,
"UseSSL": false,
"Port": "80",
@@ -56,7 +56,8 @@
"EmailSettings": {
"SMTPUsername": "",
"SMTPPassword": "",
- "SMTPServer": "",
+ "SMTPServer": "localhost:25",
+ "UseTLS": false,
"FeedbackEmail": "feedback@mattermost.com",
"FeedbackName": "",
"ApplePushServer": "",
diff --git a/config/main.cf b/config/main.cf
new file mode 100644
index 000000000..72eba333f
--- /dev/null
+++ b/config/main.cf
@@ -0,0 +1,41 @@
+# 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
diff --git a/docker-entry.sh b/docker-entry.sh
index 10809fc1d..3a273e365 100755
--- a/docker-entry.sh
+++ b/docker-entry.sh
@@ -101,6 +101,9 @@ sleep 5
# ------------------------
+echo starting postfix
+/etc/init.d/postfix restart
+
echo starting redis
redis-server &