Skip to content

Commit

Permalink
add Man page and rename launch.sh to novnc_proxy.
Browse files Browse the repository at this point in the history
Co-Authored-By: Adam Young <[email protected]>
  • Loading branch information
JanZerebecki and Adam Young committed Jun 25, 2021
1 parent dd20b17 commit 89e206c
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 8 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ proxy.

### Quick Start

* Use the launch script to automatically download and start websockify, which
* Use the `novnc_proxy` script to automatically download and start websockify, which
includes a mini-webserver and the WebSockets proxy. The `--vnc` option is
used to specify the location of a running VNC server:

`./utils/launch.sh --vnc localhost:5901`
`./utils/novnc_proxy --vnc localhost:5901`

* Point your browser to the cut-and-paste URL that is output by the launch
* Point your browser to the cut-and-paste URL that is output by the `novnc_procy`
script. Hit the Connect button, enter a password if the VNC server has one
configured, and enjoy!

Expand Down
37 changes: 37 additions & 0 deletions docs/novnc_proxy.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
.TH novnc_proxy 1 "June 25, 2020" "version 1.2.0" "USER COMMANDS"

.SH NAME
novnc_proxy - noVNC proxy server
.SH SYNOPSIS
.B novnc_proxy [--listen PORT] [--vnc VNC_HOST:PORT] [--cert CERT] [--ssl-only]

Starts the WebSockets proxy and a mini-webserver and
provides a cut-and-paste URL to go to.

--listen PORT Port for proxy/webserver to listen on
Default: 6080
--vnc VNC_HOST:PORT VNC server host:port proxy target
Default: localhost:5900
--cert CERT Path to combined cert/key file, or just
the cert file if used with --key
Default: self.pem
--key KEY Path to key file, when not combined with cert
--web WEB Path to web files (e.g. vnc.html)
Default: ./
--ssl-only Disable non-https connections.

--record FILE Record traffic to FILE.session.js

--syslog SERVER Can be local socket such as /dev/log, or a UDP host:port pair.

--heartbeat SEC send a ping to the client every SEC seconds
--timeout SEC after SEC seconds exit when not connected
--idle-timeout SEC server exits after SEC seconds if there are no
active connections

.SH AUTHOR
The noVNC Authors
https://github.com/novnc/noVNC

.SH SEE ALSO
websockify(1), nova-novncproxy(1)
2 changes: 1 addition & 1 deletion snap/local/svc_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ snapctl get services | jq -c '.[]' | while read service; do # for each service t
echo "novnc: not starting service ${service} with listen_port ${listen_port} and vnc_host_port ${vnc_host_port}"
else
# start (and fork with '&') the service using the specified listen port and VNC host:port
$SNAP/launch.sh --listen $listen_port --vnc $vnc_host_port &
$SNAP/novnc_proxy --listen $listen_port --vnc $vnc_host_port &
fi
done
6 changes: 3 additions & 3 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ parts:
source: .
plugin: dump
organize:
utils/launch.sh: /
utils/novnc_proxy: /
stage:
- vnc.html
- app
- core/**/*.js
- vendor/**/*.js
- launch.sh
- novnc_proxy
stage-packages:
- bash

Expand All @@ -47,7 +47,7 @@ hooks:

apps:
novnc:
command: ./launch.sh
command: ./novnc_proxy
plugs: [network, network-bind]
novncsvc:
command: ./svc_wrapper.sh
Expand Down
2 changes: 1 addition & 1 deletion utils/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## WebSockets Proxy/Bridge

Websockify has been forked out into its own project. `launch.sh` wil
Websockify has been forked out into its own project. `novnc_proxy` will
automatically download it here if it is not already present and not
installed as system-wide.

Expand Down
File renamed without changes.

0 comments on commit 89e206c

Please sign in to comment.