diff --git a/docker-compose.yml b/docker-compose.yml index d92b14fe..6450a10f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,6 +71,10 @@ services: - ./docker/data/nginx/skynet:/data/nginx/skynet:ro - ./docker/data/sia/apipassword:/data/sia/apipassword:ro - ./docker/data/certbot:/etc/letsencrypt + - ./docker/nginx/libs:/etc/nginx/libs + - ./docker/nginx/conf.d:/etc/nginx/conf.d + - ./docker/nginx/conf.d.templates:/etc/nginx/templates + - ./docker/nginx/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf networks: shared: ipv4_address: 10.10.10.30 diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 12b27712..b294d522 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -14,12 +14,6 @@ ENV NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS 6 COPY docker/nginx/docker-entrypoint.sh / COPY docker/nginx/docker-entrypoint.d /docker-entrypoint.d -# copy nginx configuration files and libraries -COPY docker/nginx/libs /etc/nginx/libs -COPY docker/nginx/conf.d /etc/nginx/conf.d -COPY docker/nginx/conf.d.templates /etc/nginx/templates -COPY docker/nginx/nginx.conf /usr/local/openresty/nginx/conf/nginx.conf - ENTRYPOINT ["/docker-entrypoint.sh"] STOPSIGNAL SIGQUIT diff --git a/docker/nginx/docker-entrypoint.d/50-generate-local-certificate.sh b/docker/nginx/docker-entrypoint.d/50-generate-local-certificate.sh index d556fd3e..f5ecada1 100755 --- a/docker/nginx/docker-entrypoint.d/50-generate-local-certificate.sh +++ b/docker/nginx/docker-entrypoint.d/50-generate-local-certificate.sh @@ -7,7 +7,7 @@ set -e ME=$(basename $0) -generate_local_certificate() { +generate_local_certificate() { echo >&3 "$ME: Generating locally signed ssl certificate" openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 \ -subj '/CN=local-certificate' \