2
0
andryyy 8 жил өмнө
parent
commit
e9b97e98ec

+ 4 - 0
.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

+ 3 - 1
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 \

+ 4 - 0
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;

+ 0 - 0
data/dkim/keys/.dkim_priv_keys


+ 0 - 0
data/dkim/txt/.dkim_pub_keys


+ 2 - 2
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