diff --git a/docker-compose.yml b/docker-compose.yml index 4bf271d..709dd6f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,6 +68,7 @@ services: - INVITE_SERVICE_URL - JICOFO_AUTH_USER - MICROSOFT_API_APP_CLIENT_ID + - NGINX_RESOLVER - P2P_USE_STUN_TURN - PEOPLE_SEARCH_URL - RESOLUTION diff --git a/web/rootfs/defaults/nginx.conf b/web/rootfs/defaults/nginx.conf index 540a930..6f5ba4a 100644 --- a/web/rootfs/defaults/nginx.conf +++ b/web/rootfs/defaults/nginx.conf @@ -26,6 +26,8 @@ http { client_max_body_size 0; + resolver {{ .Env.NGINX_RESOLVER | default "127.0.0.11" }}; + include /etc/nginx/mime.types; types { # add support for wasm MIME type, that is required by specification and it is not part of default mime.types file diff --git a/web/rootfs/etc/cont-init.d/10-config b/web/rootfs/etc/cont-init.d/10-config index 75bc27b..e6553a8 100644 --- a/web/rootfs/etc/cont-init.d/10-config +++ b/web/rootfs/etc/cont-init.d/10-config @@ -52,9 +52,7 @@ if [[ $DISABLE_HTTPS -ne 1 ]]; then fi # copy config files -if [[ ! -f /config/nginx/nginx.conf ]]; then - cp /defaults/nginx.conf /config/nginx/nginx.conf -fi +tpl /defaults/nginx.conf > /config/nginx/nginx.conf if [[ ! -f /config/nginx/meet.conf ]]; then tpl /defaults/meet.conf > /config/nginx/meet.conf