diff options
| author | Devaev Maxim <[email protected]> | 2018-07-03 07:08:27 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-07-03 07:08:27 +0300 |
| commit | fa3d894172103ab1036140f7f0a61a5c0689f9ab (patch) | |
| tree | dc5fc2f6c16b7c95bc0d58b3fbc317b635c7a08b | |
| parent | fb60b0dd600bad962aa8163d9dabb6daade7e066 (diff) | |
renamed locations
| -rw-r--r-- | os/platforms/v1/index.html | 4 | ||||
| -rw-r--r-- | os/platforms/v1/nginx.conf | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/os/platforms/v1/index.html b/os/platforms/v1/index.html index f08c0c12..399d2e89 100644 --- a/os/platforms/v1/index.html +++ b/os/platforms/v1/index.html @@ -32,11 +32,11 @@ body { function onWsMessage(message) { console.log(message.data); if (message.data == "EVENT mjpg_streamer started") { - document.getElementById("stream-image").src = "/video/?action=stream&time=" + new Date().getTime(); + document.getElementById("stream-image").src = "/streamer/?action=stream&time=" + new Date().getTime(); } } -ws = new WebSocket("ws://" + location.host + "/kvm/ws"); +ws = new WebSocket("ws://" + location.host + "/kvmd/ws"); ws.onmessage = (message) => onWsMessage(message); ws.onerror = (error) => console.error(error); ws.onclose = () => console.log("closed"); diff --git a/os/platforms/v1/nginx.conf b/os/platforms/v1/nginx.conf index 9fbd41e5..0cb74801 100644 --- a/os/platforms/v1/nginx.conf +++ b/os/platforms/v1/nginx.conf @@ -44,8 +44,8 @@ http { index index.html; } - location /kvm/ws { - rewrite /kvm/ws /ws break; + location /kvmd/ws { + rewrite /kvmd/ws /ws break; proxy_pass http://kvmd; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; @@ -54,8 +54,8 @@ http { proxy_read_timeout 7d; } - location /kvm/msd/write { - rewrite /kvm/msd/write /msd/write break; + location /kvmd/msd/write { + rewrite /kvmd/msd/write /msd/write break; proxy_pass http://kvmd; limit_rate 6250k; limit_rate_after 50k; @@ -63,13 +63,13 @@ http { proxy_request_buffering off; } - location /kvm { - rewrite /kvm/?(.*) /$1 break; + location /kvmd { + rewrite /kvmd/?(.*) /$1 break; proxy_pass http://kvmd; } - location /video { - rewrite /video/?(.*) /$1 break; + location /streamer { + rewrite /streamer/?(.*) /$1 break; proxy_pass http://mjpg_streamer; } } |