diff --git a/deploy.sh b/deploy.sh index 70dc044..a441118 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 & -envsubst '$ADMIN_DOMAIN' < /dnslog/dnslog_nginx.conf > /etc/nginx/conf.d/default.conf +envsubst '$ADMIN_DOMAIN,$DNS_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/dnslog_nginx.conf b/dnslog_nginx.conf index 185c9e7..73d346a 100644 --- a/dnslog_nginx.conf +++ b/dnslog_nginx.conf @@ -1,15 +1,12 @@ server { listen 80; - server_name localhost $ADMIN_DOMAIN; + server_name localhost $ADMIN_DOMAIN *.$DNS_DOMAIN; uwsgi_pass_request_headers on; - if ($request_uri ~* "^/$") { - return 302 $scheme://$http_host/login; - } - location = /favicon.ico { access_log off; log_not_found off; } + location /static/ { alias /dnslog/static/; } diff --git a/docker-compose.yml b/docker-compose.yml index 010b11e..a6e0718 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +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;'" + command: /bin/bash -c "envsubst '$$ADMIN_DOMAIN,$$DNS_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