docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #170 from andreasfaerber/master

Browse Source 
Create and use SSL dhparam file if not mounted, NGINX_SSL_DHPARAM_BITS variable in .env.dist file
This commit is contained in:
kaiyou
2017-02-25 14:08:17 +01:00
committed by GitHub
parent cd3bd8a0cb 49904c0945
commit f421bee148
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.env.dist
View File

@@ -69,6 +69,13 @@ RELAYHOST=
# Fetchmail delay # Fetchmail delay
FETCHMAIL_DELAY=600 FETCHMAIL_DELAY=600
###################################
# Nginx settings
###################################
# SSL DHPARAM Bits
NGINX_SSL_DHPARAM_BITS=2048
################################### ###################################
# Developers # Developers
################################### ###################################

1
nginx/nginx.conf.default
View File

@@ -35,6 +35,7 @@ http {
ssl_session_cache shared:SSL:50m; ssl_session_cache shared:SSL:50m;
ssl_certificate /certs/cert.pem; ssl_certificate /certs/cert.pem;
ssl_certificate_key /certs/key.pem; ssl_certificate_key /certs/key.pem;
ssl_dhparam /etc/nginx/dhparam.pem;
add_header Strict-Transport-Security max-age=15768000; add_header Strict-Transport-Security max-age=15768000;

1
nginx/nginx.conf.fallback
View File

@@ -30,6 +30,7 @@ http {
ssl_session_cache shared:SSL:50m; ssl_session_cache shared:SSL:50m;
ssl_certificate /tmp/snakeoil.pem; ssl_certificate /tmp/snakeoil.pem;
ssl_certificate_key /tmp/snakeoil.pem; ssl_certificate_key /tmp/snakeoil.pem;
ssl_dhparam /etc/nginx/dhparam.pem;
add_header Strict-Transport-Security max-age=15768000; add_header Strict-Transport-Security max-age=15768000;

4
nginx/start.sh
View File

@@ -9,4 +9,8 @@ L=None/O=None/CN=$DOMAIN"
cp /etc/nginx/nginx.conf.fallback /etc/nginx/nginx.conf cp /etc/nginx/nginx.conf.fallback /etc/nginx/nginx.conf
fi fi
if [ ! -r /etc/nginx/dhparam.pem ]; then
openssl dhparam -out /etc/nginx/dhparam.pem $NGINX_SSL_DHPARAM_BITS
fi
nginx -g 'daemon off;' nginx -g 'daemon off;'