diff --git a/Dockerfile b/Dockerfile index d9b9fc2..9ce0f61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,8 +21,7 @@ RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime COPY ./dc3/nginx/ /etc/nginx/ COPY ./dist/ /usr/share/nginx/html/dc3/demo/ -COPY ./dc3/dependencies/ssl/ /etc/ssl/ -COPY ./dc3/dependencies/conf.crt/ /etc/nginx/conf.crt/ +COPY ./dc3/dependencies/conf.crt/ /etc/letsencrypt/live/ EXPOSE 80 443 VOLUME /var/log/nginx diff --git a/dc3/dependencies/ssl/certs/dhparam.pem b/dc3/dependencies/ssl/certs/dhparam.pem deleted file mode 100644 index 6ef60d7..0000000 --- a/dc3/dependencies/ssl/certs/dhparam.pem +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN DH PARAMETERS----- -MIIBCAKCAQEAsp+BdCoH3P0L+q1Ew8L5Xt+2FvxlA+Fk9IXEHPEJszU/BDos3BEd -3V7jlmR/WZOJmwnjbyS+P/xI4fprQFZUhZSZPvotlGnUrZbwcPUDtqR7ELnrGFlt -YnUKMAVBSDCYsqVncxfoaEYVEG1Z64dwP4R4EFO600Wl7k9ympIYp6DXh96nRi8N -4aeZ0Dsm/JG+ymnEgG6W3alN7ACgd+Lt/UlxmxzUf+mp4RRofiY4jyQe+WxeTzkc -3j0eZ11Z3vbUz2FmH/xXYsH8DFEHRF3sayLPZeg/hXlL14ckYnCG3ywhNRBZWu/h -ofNGWs1RF2n+uaNlwSbSxb408FK7kFS2wwIBAg== ------END DH PARAMETERS----- diff --git a/dc3/nginx/conf.d/default.conf b/dc3/nginx/conf.d/default.conf index af28347..0d9b69a 100644 --- a/dc3/nginx/conf.d/default.conf +++ b/dc3/nginx/conf.d/default.conf @@ -19,8 +19,8 @@ server { ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_ciphers HIGH:!aNULL:!MD5; - ssl_certificate /etc/nginx/conf.crt/dc3.site/fullchain.pem; - ssl_certificate_key /etc/nginx/conf.crt/dc3.site/privkey.pem; + ssl_certificate /etc/letsencrypt/live/dc3.site/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/dc3.site/privkey.pem; rewrite ^/$ /dc3/demo permanent;