shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-25 23:21:29 +03:00
Code Releases Wiki Activity

F #878: Enable path based NoVNC

Browse Source
This commit is contained in:
Le Garff Yoann 2018-06-18 10:14:24 +02:00 committed by Ruben S. Montero
parent d4ab90289f
commit 3e3cd92de8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sunstone/etc/sunstone-server.conf
View File

@ -104,7 +104,7 @@
# UI Settings
################################################################################
# :vnc_proxy_
# port: port where the vnc proxy will listen
# port: port where the vnc proxy will listen. Could be prefixed with an address on which the sever will be listening (ex: 127.0.0.1:29876).
# support_wss: no | yes | only. For yes and only, provide path to
# cert and key. "yes" means both ws and wss connections will be
# supported.
@ -112,6 +112,8 @@
# vnc_proxy_key: Key for wss connections. Only necessary if not included in cert.
# vnc_proxy_ipv6: Enable ipv6 support for novnc-server
#
# :vnc_client_port: port where the vnc JS client will connect
# If not set, will use the port section of :vnc_proxy_port
# :vnc_request_password: true | false
# Request VNC password for external windows, by default it will not be requested
#

2
src/sunstone/public/app/sunstone-config.js
View File

@ -146,7 +146,7 @@ define(function(require) {
},
'tableOrder': _config['user_config']['table_order'],
'vncProxyPort': _config['system_config']['vnc_proxy_port'],
'vncProxyPort': _config['system_config']['vnc_client_port'] || _config['system_config']['vnc_proxy_port'].split(':')[1] || _config['system_config']['vnc_proxy_port'],
'vncWSS': _config['user_config']['vnc_wss'],
'requestVNCPassword': _config['system_config']['vnc_request_password'],
'logo': (_config['view']["small_logo"] || "images/one_small_logo.png"),