From b969857583bee2dac8db8ada0c8b49adddfd1c6c Mon Sep 17 00:00:00 2001 From: fkwp Date: Thu, 22 May 2025 12:49:37 +0200 Subject: [PATCH 1/2] Allow the jwt service to be running locallay rather than part of the docker-compose. This helps with developing the lk-jwt-service --- backend/dev_nginx.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/dev_nginx.conf b/backend/dev_nginx.conf index 44fef8a5..af370d2e 100644 --- a/backend/dev_nginx.conf +++ b/backend/dev_nginx.conf @@ -43,6 +43,11 @@ server { # MatrixRTC reverse proxy # - MatrixRTC Authorization Service # - LiveKit SFU websocket signaling connection +upstream jwt-auth-services { + server auth-server:8080; + server host.docker.internal:8080; +} + server { listen 80; listen [::]:80; @@ -63,7 +68,8 @@ server { proxy_set_header X-Forwarded-Proto $scheme; # JWT Service running at port 8080 - proxy_pass http://auth-server:8080/; + proxy_pass http://jwt-auth-services/; + } location ^~ /livekit/sfu/ { From d585f6232e4b530212231710f0cc2d98125221fd Mon Sep 17 00:00:00 2001 From: fkwp Date: Tue, 27 May 2025 16:30:06 +0200 Subject: [PATCH 2/2] change JWT port ot 6080 to not conflict with the playwright tests. --- backend/dev_nginx.conf | 4 ++-- dev-backend-docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/dev_nginx.conf b/backend/dev_nginx.conf index 44fef8a5..ea890a30 100644 --- a/backend/dev_nginx.conf +++ b/backend/dev_nginx.conf @@ -62,8 +62,8 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - # JWT Service running at port 8080 - proxy_pass http://auth-server:8080/; + # JWT Service running at port 6080 + proxy_pass http://auth-server:6080/; } location ^~ /livekit/sfu/ { diff --git a/dev-backend-docker-compose.yml b/dev-backend-docker-compose.yml index da3c3530..d711c41a 100644 --- a/dev-backend-docker-compose.yml +++ b/dev-backend-docker-compose.yml @@ -6,7 +6,7 @@ services: image: ghcr.io/element-hq/lk-jwt-service:latest-ci hostname: auth-server environment: - - LIVEKIT_JWT_PORT=8080 + - LIVEKIT_JWT_PORT=6080 - LIVEKIT_URL=wss://matrix-rtc.m.localhost/livekit/sfu - LIVEKIT_KEY=devkey - LIVEKIT_SECRET=secret @@ -18,7 +18,7 @@ services: condition: on-failure ports: # HOST_PORT:CONTAINER_PORT - - 8080:8080 + - 6080:6080 networks: - ecbackend