diff --git a/servers/skel/docker-compose.d/custom/nginx/Dockerfile b/servers/skel/docker-compose.d/custom/nginx/Dockerfile index 499e182..6bb5b49 100644 --- a/servers/skel/docker-compose.d/custom/nginx/Dockerfile +++ b/servers/skel/docker-compose.d/custom/nginx/Dockerfile @@ -5,7 +5,7 @@ RUN apk add \ certbot-nginx COPY content /usr/share/nginx/html -COPY conf.d /etc/nginx +COPY conf.d/ /etc/nginx/conf.d/ COPY nginx.conf /etc/nginx/nginx.conf COPY entrypoint.sh /entrypoint diff --git a/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf b/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf index 6634d60..6f8a80f 100644 --- a/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf +++ b/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf @@ -2,6 +2,8 @@ server { listen 80; server_name localhost; + # SSL is managed by certbot, no need for a ssl listen; it will be generated automagically! + # default html page location / { root /usr/share/nginx/html; @@ -13,14 +15,3 @@ server { root /usr/share/nginx/html; } } - -server { - listen 443 ssl; - server_name localhost; - - # SSL will be managed by certbot, no need to insert SSL config. - - location / { - proxy_pass http://$host$request_uri; - } -} \ No newline at end of file