Jelajahi Sumber

nginx: required dependencies for proxy_pass calc

Aaron van Meerten 3 tahun lalu
induk
melakukan
dd37e5d2b1
3 mengubah file dengan 4 tambahan dan 3 penghapusan
  1. 1 0
      docker-compose.yml
  2. 1 1
      web/Dockerfile
  3. 2 2
      web/rootfs/defaults/meet.conf

+ 1 - 0
docker-compose.yml

@@ -122,6 +122,7 @@ services:
             - XMPP_GUEST_DOMAIN
             - XMPP_MUC_DOMAIN
             - XMPP_RECORDER_DOMAIN
+            - XMPP_SERVER
         networks:
             meet.jitsi:
 

+ 1 - 1
web/Dockerfile

@@ -6,7 +6,7 @@ ADD https://raw.githubusercontent.com/acmesh-official/acme.sh/2.8.8/acme.sh /opt
 COPY rootfs/ /
 
 RUN apt-dpkg-wrap apt-get update && \
-    apt-dpkg-wrap apt-get install -y cron nginx-extras jitsi-meet-web socat && \
+    apt-dpkg-wrap apt-get install -y cron nginx-extras jitsi-meet-web socat iproute2 dnsutils && \
     apt-dpkg-wrap apt-get -d install -y jitsi-meet-web-config && \
     dpkg -x /var/cache/apt/archives/jitsi-meet-web-config*.deb /tmp/pkg && \
     mv /tmp/pkg/usr/share/jitsi-meet-web-config/config.js /defaults && \

+ 2 - 2
web/rootfs/defaults/meet.conf

@@ -48,8 +48,8 @@ location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.
 
 {{ if $ENABLE_COLIBRI_WEBSOCKET }}
 # colibri (JVB) websockets
-location ~ ^/colibri-ws/([a-zA-Z0-9-\.]+)/(.*) {
-    proxy_pass http://{{ $WS_SERVER_ID }}:9090/colibri-ws/$1/$2$is_args$args;
+location ~ ^/colibri-ws/{{ $WS_SERVER_ID }}/(.*) {
+    proxy_pass http://{{ $WS_SERVER_ID }}:9090/colibri-ws/{{ $WS_SERVER_ID }}/$1$is_args$args;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";