Backup_Repos/docker-ubuntu-vnc-desktop
1
0
Fork 0
mirror of https://github.com/fcwu/docker-ubuntu-vnc-desktop synced 2025-12-06 08:22:31 +01:00
Code Issues Projects Releases Wiki Activity

fix(websocket): RELATIVE_URL_ROOT not works on websockify (#157)

Browse source
This commit is contained in:
Doro Wu 2020-05-26 15:21:30 +08:00
parent ae4e571be3
commit 9d7362e87c
No known key found for this signature in database
GPG key ID: 3F2E4F1C2D4A1AA4
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
rootfs/etc/nginx/sites-enabled/default
View file

@ -13,28 +13,30 @@ server {
root /usr/local/lib/web/frontend/; root /usr/local/lib/web/frontend/;
index index.html index.htm; index index.html index.htm;
location ~ /api/ {
try_files $uri @api;
}
location ~ /resize$ {
try_files $uri @api;
}
#_RELATIVE_URL_ROOT_location /_RELATIVE_URL_ROOT_/ { #_RELATIVE_URL_ROOT_location /_RELATIVE_URL_ROOT_/ {
#_RELATIVE_URL_ROOT_ rewrite /_RELATIVE_URL_ROOT_/(.*) /$1 break; #_RELATIVE_URL_ROOT_ rewrite /_RELATIVE_URL_ROOT_/(.*) /$1 break;
#_RELATIVE_URL_ROOT_ root /usr/local/lib/web/frontend/; #_RELATIVE_URL_ROOT_ root /usr/local/lib/web/frontend/;
#_RELATIVE_URL_ROOT_} #_RELATIVE_URL_ROOT_}
location ~ /websockify$ { location ~ .*/(api/.*|websockify) {
try_files $uri @api$http_upgrade;
}
location / {
rewrite /approot/(.*) /$1 break;
root /usr/local/lib/web/frontend/;
}
location @apiwebsocket {
#_RELATIVE_URL_ROOT_rewrite /_RELATIVE_URL_ROOT_/(.*) $1 break; #_RELATIVE_URL_ROOT_rewrite /_RELATIVE_URL_ROOT_/(.*) $1 break;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_buffering off;
proxy_connect_timeout 7d; proxy_connect_timeout 7d;
proxy_send_timeout 7d; proxy_send_timeout 7d;
proxy_read_timeout 7d; proxy_read_timeout 7d;
proxy_buffering off;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_pass http://127.0.0.1:6081; proxy_pass http://127.0.0.1:6081;
} }
@ -43,8 +45,8 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_pass http://127.0.0.1:6079;
max_ranges 0; max_ranges 0;
proxy_pass http://127.0.0.1:6079;
} }
} }

1
rootfs/etc/supervisor/conf.d/supervisord.conf
View file

@ -38,6 +38,7 @@ priority=15
directory=%HOME% directory=%HOME%
command=/usr/bin/pcmanfm --desktop --profile LXDE command=/usr/bin/pcmanfm --desktop --profile LXDE
user=%USER% user=%USER%
stopwaitsecs=3
environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%" environment=DISPLAY=":1",HOME="%HOME%",USER="%USER%"

2
web/src/components/Vnc.vue
View file

@ -136,7 +136,7 @@ export default {
// console.trace() // console.trace()
console.log(`connecting...`) console.log(`connecting...`)
this.errorMessage = '' this.errorMessage = ''
let websockifyPath = 'websockify' let websockifyPath = location.pathname.substr(1) + 'websockify'
if (force || this.vncState === 'stopped') { if (force || this.vncState === 'stopped') {
this.vncState = 'connecting' this.vncState = 'connecting'
let hostname = window.location.hostname let hostname = window.location.hostname