lava/dockermail diff

git.diff

diff --git a/Makefile b/Makefile
index 65673b1..5503fd2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ owncloud: dovecot
        cd owncloud; docker build -t owncloud:7.0.2 .
 
 run-dovecot:
-       docker run -d -p 0.0.0.0:25:25 -p 0.0.0.0:587:587 -p 0.0.0.0:143:143 -v /srv/vmail:/srv/vmail dovecot:2.1.7
+       docker run -d -p 0.0.0.0:25:25 -p 0.0.0.0:587:587 -p 0.0.0.0:143:143 -v /srv/vmail:/srv/vmail -v /ssl:/ssl  dovecot:2.1.7
 
 run-rainloop:
        docker run -d -p 127.0.0.1:33100:80 rainloop:1.6.9
diff --git a/dovecot/Dockerfile b/dovecot/Dockerfile
index 96b2294..f7c8900 100644
--- a/dovecot/Dockerfile
+++ b/dovecot/Dockerfile
@@ -67,5 +67,5 @@ EXPOSE 587
 # http://www.synology-wiki.de/index.php/Zusaetzliche_Ports_fuer_Postfix
 
 # start necessary services for operation (dovecot -F starts dovecot in the foreground to prevent container exit)
-ENTRYPOINT chown -R vmail:vmail /srv/vmail; service rsyslog start; service postfix start; dovecot -F
+ENTRYPOINT chown -R vmail:vmail /srv/vmail; chown -R vmail:vmail /ssl; service rsyslog start; service postfix start; dovecot -F
 
diff --git a/dovecot/dovecot.master b/dovecot/dovecot.master
index 226be08..d626794 100644
--- a/dovecot/dovecot.master
+++ b/dovecot/dovecot.master
@@ -1,11 +1,12 @@
 service imap-login {
        inet_listener imap {
-
+               port = 143
        }
 
        #disable imaps since we use TLS connections through the standard imap
        inet_listener imaps {
-               port = 0
+               port = 993
+               ssl = yes
        }
 }
 
diff --git a/dovecot/dovecot.ssl b/dovecot/dovecot.ssl
index 4f86889..bdbbc54 100644
--- a/dovecot/dovecot.ssl
+++ b/dovecot/dovecot.ssl
@@ -1,5 +1,5 @@
 ssl = required
 disable_plaintext_auth = yes
-ssl_cert = </etc/dovecot/dovecot.pem
-ssl_key = </etc/dovecot/private/dovecot.pem
+ssl_cert = </ssl/saltybooth_com/saltybooth_bundle.crt
+ssl_key = </ssl/saltybooth_com/saltybooth.key
 
diff --git a/dovecot/postfix.main.cf b/dovecot/postfix.main.cf
index 3dd7d76..976628f 100644
--- a/dovecot/postfix.main.cf
+++ b/dovecot/postfix.main.cf
@@ -18,8 +18,8 @@ append_dot_mydomain = no
 readme_directory = no
 
 # TLS parameters
-smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
diff --git a/Makefile b/Makefile
index 65673b1..5503fd2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ owncloud: dovecot
        cd owncloud; docker build -t owncloud:7.0.2 .
 
 run-dovecot:
-       docker run -d -p 0.0.0.0:25:25 -p 0.0.0.0:587:587 -p 0.0.0.0:143:143 -v /srv/vmail:/srv/vmail dovecot:2.1.7
+       docker run -d -p 0.0.0.0:25:25 -p 0.0.0.0:587:587 -p 0.0.0.0:143:143 -v /srv/vmail:/srv/vmail -v /ssl:/ssl  dovecot:2.1.7
 
 run-rainloop:
        docker run -d -p 127.0.0.1:33100:80 rainloop:1.6.9
diff --git a/dovecot/Dockerfile b/dovecot/Dockerfile
index 96b2294..f7c8900 100644
--- a/dovecot/Dockerfile
+++ b/dovecot/Dockerfile
@@ -67,5 +67,5 @@ EXPOSE 587
 # http://www.synology-wiki.de/index.php/Zusaetzliche_Ports_fuer_Postfix
 
 # start necessary services for operation (dovecot -F starts dovecot in the foreground to prevent container exit)
-ENTRYPOINT chown -R vmail:vmail /srv/vmail; service rsyslog start; service postfix start; dovecot -F
+ENTRYPOINT chown -R vmail:vmail /srv/vmail; chown -R vmail:vmail /ssl; service rsyslog start; service postfix start; dovecot -F
 
diff --git a/dovecot/dovecot.master b/dovecot/dovecot.master
index 226be08..d626794 100644
--- a/dovecot/dovecot.master
+++ b/dovecot/dovecot.master
@@ -1,11 +1,12 @@
 service imap-login {
        inet_listener imap {
index 226be08..d626794 100644
--- a/dovecot/dovecot.master
+++ b/dovecot/dovecot.master
@@ -1,11 +1,12 @@
 service imap-login {
        inet_listener imap {
-
+               port = 143
        }
 
        #disable imaps since we use TLS connections through the standard imap
        inet_listener imaps {
-               port = 0
+               port = 993
+               ssl = yes
        }
 }
 
diff --git a/dovecot/dovecot.ssl b/dovecot/dovecot.ssl
index 4f86889..bdbbc54 100644
--- a/dovecot/dovecot.ssl
+++ b/dovecot/dovecot.ssl
@@ -1,5 +1,5 @@
 ssl = required
 disable_plaintext_auth = yes
-ssl_cert = </etc/dovecot/dovecot.pem
-ssl_key = </etc/dovecot/private/dovecot.pem
+ssl_cert = </ssl/saltybooth_com/saltybooth_bundle.crt
+ssl_key = </ssl/saltybooth_com/saltybooth.key
 
diff --git a/dovecot/postfix.main.cf b/dovecot/postfix.main.cf
index 3dd7d76..976628f 100644
--- a/dovecot/postfix.main.cf
+++ b/dovecot/postfix.main.cf
@@ -18,8 +18,8 @@ append_dot_mydomain = no
 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_tls_cert_file=/ssl/saltybooth_com/saltybooth_bundle.crt
+smtpd_tls_key_file=/ssl/saltybooth_com/saltybooth.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