From e9b97e98eccc50515a9d44ea2d712b08c3c427d5 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Fri, 9 Dec 2016 21:10:11 +0100
Subject: [PATCH] Some changes

---
 .gitignore                     | 4 ++++
 build-nginx.sh                 | 4 +++-
 data/conf/nginx/site.conf      | 4 ++++
 data/dkim/keys/.dkim_priv_keys | 0
 data/dkim/txt/.dkim_pub_keys   | 0
 mailcow.conf                   | 4 ++--
 6 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 data/dkim/keys/.dkim_priv_keys
 create mode 100644 data/dkim/txt/.dkim_pub_keys

diff --git a/.gitignore b/.gitignore
index c8f1dff3..4c8808c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,7 @@ data/db/mysql/*
 data/db/redis/*
 !data/db/redis/.redis_data
 data/vmail/*
+data/dkim/keys/*
+!data/dkim/keys/.dkim_priv_keys
+data/dkim/txt/*
+!data/dkim/txt/.dkim_pub_keys
diff --git a/build-nginx.sh b/build-nginx.sh
index 5941ce70..7e6b3cfb 100755
--- a/build-nginx.sh
+++ b/build-nginx.sh
@@ -22,11 +22,13 @@ fi
 sed -i "s#database_name.*#database_name = \"${DBNAME}\";#" data/web/inc/vars.inc.php
 sed -i "s#database_user.*#database_user = \"${DBUSER}\";#" data/web/inc/vars.inc.php
 sed -i "s#database_pass.*#database_pass = \"${DBPASS}\";#" data/web/inc/vars.inc.php
+sed -i "s#database_user.*#database_user = \"${DBUSER}\";#" data/conf/nginx/vars.inc.php
 
 docker run \
-	-d -p ${HTTP_PORT}:80 \
+	-p 443:443 \
 	--name ${NAME} \
 	-v ${PWD}/data/web:/web:ro \
+	-v ${PWD}/data/assets/ssl/:/etc/ssl/mail/:ro \
 	-v ${PWD}/data/conf/nginx/:/etc/nginx/conf.d/:ro \
 	--network=${DOCKER_NETWORK} \
 	--network-alias nginx \
diff --git a/data/conf/nginx/site.conf b/data/conf/nginx/site.conf
index cff5c513..9e07fae9 100644
--- a/data/conf/nginx/site.conf
+++ b/data/conf/nginx/site.conf
@@ -1,4 +1,8 @@
 server {
+		listen 443;
+		ssl on;
+		ssl_certificate /etc/ssl/mail/mail.crt;
+		ssl_certificate_key /etc/ssl/mail/mail.key;
 	    index index.php index.html;
 	    server_name _;
 	    error_log  /var/log/nginx/error.log;
diff --git a/data/dkim/keys/.dkim_priv_keys b/data/dkim/keys/.dkim_priv_keys
new file mode 100644
index 00000000..e69de29b
diff --git a/data/dkim/txt/.dkim_pub_keys b/data/dkim/txt/.dkim_pub_keys
new file mode 100644
index 00000000..e69de29b
diff --git a/mailcow.conf b/mailcow.conf
index f408dca2..73ae16b3 100644
--- a/mailcow.conf
+++ b/mailcow.conf
@@ -18,13 +18,13 @@ DBVERS=5.5
 SOGOCHILDS=20
 
 # Webserver configuration
-HTTP_PORT=81
+# Default port binding for Nginx is 443
 PHPVERS="5.6-fpm"
 NGINXVERS="stable"
 
 # You should leave that alone
 # Can also be 1.2.3.4:25 for specific binding
-SMTP_PORT=26
+SMTP_PORT=25
 SMTPS_PORT=465
 SUBMISSION_PORT=587
 IMAP_PORT=143