feature #2454: Add ipv6 option to novnc(cherry picked from commit 21ca0b49fc)

This commit is contained in:
Daniel Molina committed 2013-11-14 17:31:51 +01:00
1 parent a960d93936
commit cf4e95ab5c
2 files changed
+8

No files matched your search

+6
View File
@@ -80,6 +80,8 @@ class OpenNebulaVNC
@proxy_path = File.join(SHARE_LOCATION, "websockify/websocketproxy.py")
@proxy_port = config[:vnc_proxy_port]
@proxy_ipv6 = config[:vnc_proxy_ipv6]
@wss = config[:vnc_proxy_support_wss]
@lock_file = NOVNC_LOCK_FILE
@@ -113,6 +115,10 @@ class OpenNebulaVNC
proxy_options << " --ssl-only" if @wss == "only"
end
if @proxy_ipv6
proxy_options << " -6"
end
cmd ="python #{@proxy_path} #{proxy_options} #{@proxy_port}"
begin
+2
View File
@@ -81,10 +81,12 @@
# supported.
# vnc_proxy_cert: Certificate to encrypt wss connections.
# vnc_proxy_key: Key for wss connections. Only necessary if not included in cert.
# vnc_proxy_ipv6: Enable ipv6 support for novnc-server
:vnc_proxy_port: 29876
:vnc_proxy_support_wss: no
:vnc_proxy_cert:
:vnc_proxy_key:
:vnc_proxy_ipv6: false
# Default language setting