From 182e12782a69503208b5ad331b047c08998b15fe Mon Sep 17 00:00:00 2001
From: William Kray <william@kray.ca>
Date: Wed, 4 Jan 2017 09:04:08 -0800
Subject: [PATCH 1/2] include more SSL ciphers, fixes issue with davdroid
 syncing also include nginx listener on :80 to redirect to :443

---
 data/conf/nginx/site.conf | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/conf/nginx/site.conf b/data/conf/nginx/site.conf
index 43570d0c..79fcc099 100644
--- a/data/conf/nginx/site.conf
+++ b/data/conf/nginx/site.conf
@@ -1,3 +1,9 @@
+server {
+       listen         80;
+       server_name    _;
+       return         301 https://$host$request_uri;
+}
+
 server {
   listen 443;
   ssl on;
@@ -5,7 +11,7 @@ server {
   ssl_certificate_key /etc/ssl/mail/key.pem;
   ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
   ssl_prefer_server_ciphers on;
-  ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
+  ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA;
   ssl_ecdh_curve secp384r1;
   add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload";
   index index.php index.html;

From b6b3f481fa44431a71ae67d5f4e75eda909c74ca Mon Sep 17 00:00:00 2001
From: William Kray <william@kray.ca>
Date: Wed, 4 Jan 2017 09:09:41 -0800
Subject: [PATCH 2/2] open port :80 for redirect listener

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index b91c5516..85021b57 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -214,6 +214,7 @@ services:
       dns_search: mailcow-network
       ports:
         - "443:443"
+        - "80:80"
       restart: always
       networks:
         mailcow-network: