Bladeren bron

web: allow custom colibri websocket port (#1491)

Aaron van Meerten 2 jaren geleden
bovenliggende
commit
ca0b92e
2 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 1 0
      docker-compose.yml
  2. 3 2
      web/rootfs/defaults/meet.conf

+ 1 - 0
docker-compose.yml

@@ -23,6 +23,7 @@ services:
             - CALLSTATS_ID
             - CALLSTATS_SECRET
             - CHROME_EXTENSION_BANNER_JSON
+            - COLIBRI_WEBSOCKET_PORT
             - CONFCODE_URL
             - CONFIG_EXTERNAL_CONNECT
             - DEFAULT_LANGUAGE

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

@@ -1,4 +1,5 @@
 {{ $ENABLE_COLIBRI_WEBSOCKET := .Env.ENABLE_COLIBRI_WEBSOCKET | default "1" | toBool }}
+{{ $COLIBRI_WEBSOCKET_PORT := .Env.COLIBRI_WEBSOCKET_PORT | default "9090" }}
 {{ $ENABLE_JAAS_COMPONENTS := .Env.ENABLE_JAAS_COMPONENTS | default "0" | toBool }}
 {{ $ENABLE_OCTO := .Env.ENABLE_OCTO | default "0" | toBool -}}
 {{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool }}
@@ -75,7 +76,7 @@ location ~ ^/colibri-ws/([a-zA-Z0-9-\._]+)/(.*) {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
 
-    proxy_pass http://$1:9090/colibri-ws/$1/$2$is_args$args;
+    proxy_pass http://$1:{{ $COLIBRI_WEBSOCKET_PORT }}/colibri-ws/$1/$2$is_args$args;
 }
 
 {{ if $ENABLE_OCTO }}
@@ -87,7 +88,7 @@ location ~ ^/colibri-relay-ws/([a-zA-Z0-9-\._]+)/(.*) {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
 
-    proxy_pass http://$1:9090/colibri-relay-ws/$1/$2$is_args$args;
+    proxy_pass http://$1:{{ $COLIBRI_WEBSOCKET_PORT }}/colibri-relay-ws/$1/$2$is_args$args;
 }
 {{ end }}
 {{ end }}