mirrors/docker-jitsi-meet
1
0
Fork 0
mirror of https://github.com/jitsi/docker-jitsi-meet.git synced 2026-04-02 15:51:05 +02:00
Code Issues Projects Releases Wiki Activity

web: auto-detect nginx resolver

Browse Source 
Take it from /etc/resolv.conf in case it wasn't provided via the env
variable.

Fixes: https://github.com/jitsi/docker-jitsi-meet/issues/1430
This commit is contained in:
Saúl Ibarra Corretgé 2022-11-03 14:03:13 +01:00
parent 9fbb5bd815
commit 53b2654556
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/rootfs/defaults/nginx.conf
View File

@ -26,7 +26,9 @@ http {
client_max_body_size 0;
resolver {{ .Env.NGINX_RESOLVER | default "127.0.0.11" }};
{{ if .Env.NGINX_RESOLVER }}
resolver {{ .Env.NGINX_RESOLVER }};
{{ end -}}
include /etc/nginx/mime.types;
types {

7
web/rootfs/etc/cont-init.d/10-config
View File

@ -63,6 +63,13 @@ if [[ $DISABLE_HTTPS -ne 1 ]]; then
fi
fi
# Detect nameserver for Nginx, if not specified.
if [[ -z "$NGINX_RESOLVER" ]]; then
export NGINX_RESOLVER=$(grep nameserver /etc/resolv.conf | cut -d" " -f2 | tr "\n" " " | sed -e "s/[[:space:]]*$//")
fi
echo "Using Nginx resolver: =$NGINX_RESOLVER="
# copy config files
tpl /defaults/nginx.conf > /config/nginx/nginx.conf