From 550dbfb53348477d8e895835bd9a108c8d19d371 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Mon, 14 Sep 2015 16:05:20 +0200
Subject: [PATCH] Use a common ssl location

---
 core/README.md              | 14 +++++++++++++-
 core/config/dovecot.ssl     |  4 ++--
 core/config/postfix.main.cf |  4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/core/README.md b/core/README.md
index ba16c2d..2c4064a 100644
--- a/core/README.md
+++ b/core/README.md
@@ -45,4 +45,16 @@ Use the the example config files in `config/example` to get you started.
 
 6. Run container and map ports 25 and 143 from the host to the container.
 
-	 `docker run -name dockermail -d -p 25:25 -p 587:587 -p 143:143 -v /var/lib/dockermail/settings:/mail_settings -v /var/lib/dockermail/vmail:/vmail dockermail_email_core`
+```
+docker run -ti -d \
+	-name dockermail \
+	-p 25:25 \
+	-p 587:587 \
+	-p 143:143 \
+	-v /var/lib/dockermail/settings:/mail_settings \
+	-v /var/lib/dockermail/vmail:/vmail \
+	-v <path-to-certs>:/etc/ssl/server
+	dockermail_email_core
+```
+
+Note that the certificates must be named `email.crt` and `email.key`.
diff --git a/core/config/dovecot.ssl b/core/config/dovecot.ssl
index 234dcfc..33dab84 100644
--- a/core/config/dovecot.ssl
+++ b/core/config/dovecot.ssl
@@ -1,5 +1,5 @@
 ssl = yes
 disable_plaintext_auth = no
-ssl_cert = </etc/ssl/certs/dovecot.pem
-ssl_key = </etc/ssl/private/dovecot.pem
+ssl_cert = </etc/ssl/server/email.crt
+ssl_key = </etc/ssl/server/email.key
 
diff --git a/core/config/postfix.main.cf b/core/config/postfix.main.cf
index bebb78f..e75722f 100644
--- a/core/config/postfix.main.cf
+++ b/core/config/postfix.main.cf
@@ -19,8 +19,8 @@ append_dot_mydomain = no
 readme_directory = no
 
 # TLS parameters
-smtpd_tls_cert_file=/etc/ssl/certs/postfix.pem
-smtpd_tls_key_file=/etc/ssl/private/postfix.key
+smtpd_tls_cert_file=/etc/ssl/server/email.crt
+smtpd_tls_key_file=/etc/ssl/server/email.key
 smtpd_use_tls=yes
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache