diff --git a/k8s/apps/syncthing/nginx-router.yaml b/k8s/apps/syncthing/nginx-router.yaml index 0016920..ad6a3dd 100644 --- a/k8s/apps/syncthing/nginx-router.yaml +++ b/k8s/apps/syncthing/nginx-router.yaml @@ -5,6 +5,11 @@ metadata: namespace: syncthing data: default.conf: | + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } + server { listen 80; server_name _; @@ -32,7 +37,8 @@ data: # Handle websockets proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; + proxy_set_header Connection $connection_upgrade; + proxy_read_timeout 86400; # Sub filter to fix asset paths sub_filter 'href="/' 'href="/nas/'; @@ -50,6 +56,19 @@ data: sub_filter_types text/html text/css application/javascript; } + # NAS WebSocket events + location /nas/rest/events { + proxy_pass http://syncthing-nas:8384/rest/events; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 86400; + } + # Master instance location /master { rewrite ^/master$ /master/ permanent; @@ -82,6 +101,19 @@ data: sub_filter_types text/html text/css application/javascript; } + # Master WebSocket events + location /master/rest/events { + proxy_pass http://syncthing-master:8384/rest/events; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 86400; + } + # Iris instance location /iris { rewrite ^/iris$ /iris/ permanent; @@ -113,6 +145,19 @@ data: sub_filter_once off; sub_filter_types text/html text/css application/javascript; } + + # Iris WebSocket events + location /iris/rest/events { + proxy_pass http://syncthing-khv:8384/rest/events; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 86400; + } } index.html: |