From 9cf5d3634367989d249483e1fa2bf75286c68ae2 Mon Sep 17 00:00:00 2001 From: jon r Date: Tue, 25 Feb 2025 01:04:43 +0100 Subject: [PATCH] chore(nginx): consistent use of _HOST suffix --- .env.example | 2 +- .gitpod/docker-compose.yml | 2 +- compose/etc/nginx/conf.dev | 2 +- templates/nginx.conf.j2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index e8a58128f..cc083684e 100644 --- a/.env.example +++ b/.env.example @@ -50,7 +50,7 @@ NGINX_MAX_BODY_SIZE=10G FUNKWHALE_API_HOST=api FUNKWHALE_API_PORT=5000 -FUNKWHALE_FRONT_IP=front +FUNKWHALE_FRONT_HOST=front FUNKWHALE_FRONT_PORT=${VUE_PORT} # postgres diff --git a/.gitpod/docker-compose.yml b/.gitpod/docker-compose.yml index 62b5f5930..271786a1b 100644 --- a/.gitpod/docker-compose.yml +++ b/.gitpod/docker-compose.yml @@ -30,7 +30,7 @@ services: - "FUNKWHALE_API_IP=host.docker.internal" - "FUNKWHALE_API_HOST=host.docker.internal" - "FUNKWHALE_API_PORT=5000" - - "FUNKWHALE_FRONT_IP=host.docker.internal" + - "FUNKWHALE_FRONT_HOST=host.docker.internal" - "FUNKWHALE_FRONT_PORT=8080" - "FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME-host.docker.internal}" - "FUNKWHALE_PROTOCOL=https" diff --git a/compose/etc/nginx/conf.dev b/compose/etc/nginx/conf.dev index 40af155ae..e867e2277 100644 --- a/compose/etc/nginx/conf.dev +++ b/compose/etc/nginx/conf.dev @@ -4,7 +4,7 @@ upstream funkwhale-api { } upstream funkwhale-front { - server ${FUNKWHALE_FRONT_IP}:${FUNKWHALE_FRONT_PORT}; + server ${FUNKWHALE_FRONT_HOST}:${FUNKWHALE_FRONT_PORT}; } # Required for websocket support. diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2 index 503d7abcb..8af7dbc4b 100644 --- a/templates/nginx.conf.j2 +++ b/templates/nginx.conf.j2 @@ -19,7 +19,7 @@ upstream funkwhale-api { {% if config.proxy_frontend %} upstream funkwhale-front { - server ${FUNKWHALE_FRONT_IP}:${FUNKWHALE_FRONT_PORT}; + server ${FUNKWHALE_FRONT_HOST}:${FUNKWHALE_FRONT_PORT}; } {% endif %}