web: add ability to configure the nginx resolver

pull/761/head
Saúl Ibarra Corretgé 4 years ago
parent 2f47518f57
commit 81103362b5
  1. 1
      docker-compose.yml
  2. 2
      web/rootfs/defaults/nginx.conf
  3. 4
      web/rootfs/etc/cont-init.d/10-config

@ -68,6 +68,7 @@ services:
- INVITE_SERVICE_URL - INVITE_SERVICE_URL
- JICOFO_AUTH_USER - JICOFO_AUTH_USER
- MICROSOFT_API_APP_CLIENT_ID - MICROSOFT_API_APP_CLIENT_ID
- NGINX_RESOLVER
- P2P_USE_STUN_TURN - P2P_USE_STUN_TURN
- PEOPLE_SEARCH_URL - PEOPLE_SEARCH_URL
- RESOLUTION - RESOLUTION

@ -26,6 +26,8 @@ http {
client_max_body_size 0; client_max_body_size 0;
resolver {{ .Env.NGINX_RESOLVER | default "127.0.0.11" }};
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
types { types {
# add support for wasm MIME type, that is required by specification and it is not part of default mime.types file # add support for wasm MIME type, that is required by specification and it is not part of default mime.types file

@ -52,9 +52,7 @@ if [[ $DISABLE_HTTPS -ne 1 ]]; then
fi fi
# copy config files # copy config files
if [[ ! -f /config/nginx/nginx.conf ]]; then tpl /defaults/nginx.conf > /config/nginx/nginx.conf
cp /defaults/nginx.conf /config/nginx/nginx.conf
fi
if [[ ! -f /config/nginx/meet.conf ]]; then if [[ ! -f /config/nginx/meet.conf ]]; then
tpl /defaults/meet.conf > /config/nginx/meet.conf tpl /defaults/meet.conf > /config/nginx/meet.conf

Loading…
Cancel
Save