diff --git a/Dockerfile b/Dockerfile index e6dd914..2ef5fd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,6 @@ RUN apt-get install -y \ RUN ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stderr /var/log/nginx/error.log -RUN cp /dnslog/dnslog_nginx.conf /etc/nginx/conf.d/default.conf - EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/deploy.sh b/deploy.sh index d7fd506..70dc044 100644 --- a/deploy.sh +++ b/deploy.sh @@ -30,7 +30,7 @@ pyenv virtualenv 3.8.2 dnslog ~/.pyenv/versions/dnslog/bin/python manage.py collectstatic ~/.pyenv/versions/dnslog/bin/gunicorn --workers 5 --bind 127.0.0.1:8000 dnslog.wsgi:application --daemon nohup ~/.pyenv/versions/3.8.2/envs/dnslog/bin/python3.8 ./zoneresolver.py & -cp dnslog_nginx.conf /etc/nginx/conf.d/ +envsubst '$ADMIN_DOMAIN' < /dnslog/dnslog_nginx.conf > /etc/nginx/conf.d/default.conf setsebool httpd_can_network_connect on setenforce permissive systemctl restart nginx diff --git a/docker-compose.yml b/docker-compose.yml index e17f25f..010b11e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,6 +44,7 @@ services: - 53:53/tcp - 53:53/udp - 8080:80/tcp + command: /bin/bash -c "envsubst '$$ADMIN_DOMAIN' < /dnslog/dnslog_nginx.conf > /etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'" healthcheck: test: "wget -nv -t1 --spider http://localhost/login --no-check-certificate > /dev/null" interval: 10s