diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile index ad6752ac..2c91d0b3 100644 --- a/core/nginx/Dockerfile +++ b/core/nginx/Dockerfile @@ -5,4 +5,6 @@ RUN apk add --no-cache nginx nginx-mod-mail python py-jinja2 certbot openssl COPY conf /conf COPY *.py / +COPY dhparam.pem /certs/dhparam.pem + CMD /start.py diff --git a/core/nginx/dhparam.pem b/core/nginx/dhparam.pem new file mode 100644 index 00000000..3cf0fcbc --- /dev/null +++ b/core/nginx/dhparam.pem @@ -0,0 +1,13 @@ +-----BEGIN DH PARAMETERS----- +MIICCAKCAgEA//////////+t+FRYortKmq/cViAnPTzx2LnFg84tNpWp4TZBFGQz ++8yTnc4kmz75fS/jY2MMddj2gbICrsRhetPfHtXV/WVhJDP1H18GbtCFY2VVPe0a +87VXE15/V8k1mE8McODmi3fipona8+/och3xWKE2rec1MKzKT0g6eXq8CrGCsyT7 +YdEIqUuyyOP7uWrat2DX9GgdT0Kj3jlN9K5W7edjcrsZCwenyO4KbXCeAvzhzffi +7MA0BM0oNC9hkXL+nOmFg/+OTxIy7vKBg8P+OxtMb61zO7X8vC7CIAXFjvGDfRaD +ssbzSibBsu/6iGtCOGEfz9zeNVs7ZRkDW7w09N75nAI4YbRvydbmyQd62R0mkff3 +7lmMsPrBhtkcrv4TCYUTknC0EwyTvEN5RPT9RFLi103TZPLiHnH1S/9croKrnJ32 +nuhtK8UiNjoNq8Uhl5sN6todv5pC1cRITgq80Gv6U93vPBsg7j/VnXwl5B0rZp4e +8W5vUsMWTfT7eTDp5OWIV7asfV9C1p9tGHdjzx1VA0AEh/VbpX4xzHpxNciG77Qx +iu1qHgEtnmgyqQdgCpGBMMRtx3j5ca0AOAkpmaMzy4t6Gh25PXFAADwqTs6p+Y0K +zAqCkc3OyX3Pjsm1Wn+IpGtNtahR9EGC4caKAH5eZV9q//////////8CAQI= +-----END DH PARAMETERS----- diff --git a/core/nginx/start.py b/core/nginx/start.py index f225b5f6..e6e47066 100755 --- a/core/nginx/start.py +++ b/core/nginx/start.py @@ -7,10 +7,6 @@ import subprocess if os.path.exists("/var/log/nginx.pid"): os.remove("/var/log/nginx.pid") -# Actual startup script -if not os.path.exists("/certs/dhparam.pem") and os.environ["TLS_FLAVOR"] != "notls": - os.system("openssl dhparam -out /certs/dhparam.pem 4096") - if os.environ["TLS_FLAVOR"] == "letsencrypt": subprocess.Popen(["/letsencrypt.py"])