Merge branch 'master' of github.com:Mailu/Mailu

This commit is contained in:
Pierre Jaury
2017-03-22 19:27:37 +01:00
10 changed files with 124 additions and 3 deletions

View File

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

View File

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

View File

@@ -1,6 +1,6 @@
#!/bin/sh
if [ -z ENABLE_CERTBOT ] || [ -f /certs/cert.pem ]
if [ -z $ENABLE_CERTBOT ] || [ -f /certs/cert.pem ]
then
cp /etc/nginx/nginx.conf.default /etc/nginx/nginx.conf
else
@@ -8,4 +8,8 @@ else
cp /etc/nginx/nginx.conf.fallback /etc/nginx/nginx.conf
fi
if [ ! -r /etc/nginx/dhparam.pem ]; then
openssl dhparam -out /etc/nginx/dhparam.pem $NGINX_SSL_DHPARAM_BITS
fi
nginx -g 'daemon off;'