diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml index aaa0d2ae..0b91dd93 100644 --- a/docker-compose.aur-dev.yml +++ b/docker-compose.aur-dev.yml @@ -69,8 +69,6 @@ services: - data:/data nginx: - environment: - - NGINX_PROXY_PORT=443 restart: always volumes: - data:/data diff --git a/docker-compose.yml b/docker-compose.yml index f5001417..ebc760d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -244,8 +244,7 @@ services: image: aurweb:latest init: true environment: - # Proxy toward FastAPI. - - NGINX_PROXY_PORT=8444 + - AUR_CONFIG=conf/config entrypoint: /docker/nginx-entrypoint.sh command: /docker/scripts/run-nginx.sh ports: diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf index 16421945..b5c09d08 100644 --- a/docker/config/nginx.conf +++ b/docker/config/nginx.conf @@ -136,7 +136,7 @@ http { location / { proxy_pass http://asgi_backend; - proxy_set_header Host HTTP_HOST; + proxy_set_header Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Ssl on; diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh index be5675de..1527cda7 100755 --- a/docker/nginx-entrypoint.sh +++ b/docker/nginx-entrypoint.sh @@ -21,8 +21,4 @@ fi cp -vf /docker/config/nginx.conf /etc/nginx/nginx.conf -# NGINX_PROXY_PORT must be defined for the `nginx` service -# within `docker-compose.yml`. -sed -i "s|HTTP_HOST|\$host:${NGINX_PROXY_PORT}|g" /etc/nginx/nginx.conf - exec "$@"