This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push: new 392f62d consoleproxy: use consoleproxy.domain for non-ssl enable env (#2562) 392f62d is described below commit 392f62dae0f59b3b00437d61ab8cee0ebfb9e60a Author: Rohit Yadav <ro...@apache.org> AuthorDate: Mon Apr 16 18:12:41 2018 +0530 consoleproxy: use consoleproxy.domain for non-ssl enable env (#2562) This allows CloudStack to use a console proxy domain instead of public IP address even when ssl is not enabled but console proxy url/domain is defined in global settings. Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> --- core/src/com/cloud/info/ConsoleProxyInfo.java | 5 +++++ server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/com/cloud/info/ConsoleProxyInfo.java b/core/src/com/cloud/info/ConsoleProxyInfo.java index b15abcb..16993d7 100644 --- a/core/src/com/cloud/info/ConsoleProxyInfo.java +++ b/core/src/com/cloud/info/ConsoleProxyInfo.java @@ -19,6 +19,8 @@ package com.cloud.info; +import org.apache.commons.lang3.StringUtils; + public class ConsoleProxyInfo { private boolean sslEnabled; @@ -55,6 +57,9 @@ public class ConsoleProxyInfo { proxyImageUrl += ":" + this.proxyUrlPort; } else { proxyAddress = proxyIpAddress; + if (StringUtils.isNotBlank(consoleProxyUrlDomain)) { + proxyAddress = consoleProxyUrlDomain; + } proxyPort = port; this.proxyUrlPort = proxyUrlPort; diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index f131714..e6c0a8d 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -231,7 +231,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy private String _instance; private int _proxySessionTimeoutValue = DEFAULT_PROXY_SESSION_TIMEOUT; - private boolean _sslEnabled = true; + private boolean _sslEnabled = false; private String _consoleProxyUrlDomain; // global load picture at zone basis @@ -1246,8 +1246,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy Map<String, String> configs = _configDao.getConfiguration("management-server", params); - String value = configs.get(Config.ConsoleProxyCmdPort.key()); - value = configs.get("consoleproxy.sslEnabled"); + String value = configs.get("consoleproxy.sslEnabled"); if (value != null && value.equalsIgnoreCase("true")) { _sslEnabled = true; } -- To stop receiving notification emails like this one, please contact ro...@apache.org.