Frank Kobzik has uploaded a new change for review. Change subject: engine: Minor changes in noVNC ......................................................................
engine: Minor changes in noVNC This patch changes two things: - fixes the description of WebSocketProxy in the db upgrade script - derive protocol type of noVNC page from the currently served page. Change-Id: Id9fdc22097aefee0ac13c0ff939269b66c526b86 Signed-off-by: Frantisek Kobzik <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java M packaging/etc/engine-config/engine-config.properties 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/16091/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index eef2467..25f2235 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -541,7 +541,7 @@ select fn_db_add_config_value('ClientModeSpiceDefault','Auto','general'); -- Rdp client mode default settings (Auto, Native, Plugin) select fn_db_add_config_value('ClientModeRdpDefault','Auto','general'); --- Websocket proxy configuration (Off, Engine, Host or ip/hostname:port of websockets proxy) +-- Websocket proxy configuration (Off, Engine:port, Host:port or specific ip/hostname:port of websockets proxy) select fn_db_add_config_value('WebSocketProxy','Off','general'); -- Websocket ticket validity in seconds select fn_db_add_config_value('WebSocketProxyTicketValiditySeconds','120','general'); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java index 8f0423a..c1c3147 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java @@ -21,7 +21,7 @@ private String connectionTicket; private String getTargetOrigin() { - return "http://"; + Location.getHost(); //$NON-NLS-1$ + return Location.getProtocol() + "//" + Location.getHost(); //$NON-NLS-1$ } public String getProxyHost() { @@ -37,7 +37,7 @@ } private String getClientUrl() { - return "http://"; + Location.getHost() + "/ovirt-engine-novnc-main.html?host=" + getProxyHost() + "&port=" + getProxyPort();//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ + return Location.getProtocol() + "//" + Location.getHost() + "/ovirt-engine-novnc-main.html?host=" + getProxyHost() + "&port=" + getProxyPort();//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ } public NoVncImpl() { diff --git a/packaging/etc/engine-config/engine-config.properties b/packaging/etc/engine-config/engine-config.properties index c39e499..9c14636 100644 --- a/packaging/etc/engine-config/engine-config.properties +++ b/packaging/etc/engine-config/engine-config.properties @@ -266,7 +266,7 @@ ClientModeRdpDefault.description="Default RDP console invocation behavior in the engine." ClientModeRdpDefault.validValues=Auto,Plugin,Native ClientModeRdpDefault.type=String -WebSocketProxy.description="Location of Websocket proxy Off/Host:port/Engine:port/`FQDN_or_IP`:port" +WebSocketProxy.description="Location of Websocket proxy Off/Host:port/Engine:port/specific hostname or ip:port" WebSocketProxy.type=String WebSocketProxyTicketValiditySeconds.description="Validity (in seconds) of tickets issued for websocket proxy." WebSocketProxyTicketValiditySeconds.type=Integer -- To view, visit http://gerrit.ovirt.org/16091 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9fdc22097aefee0ac13c0ff939269b66c526b86 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
