apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.11'

Browse Source
This commit is contained in:
Rohit Yadav 2018-04-17 12:58:39 +05:30
commit b940a892f7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/cloud/info/ConsoleProxyInfo.java
View File

@ -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;

5
server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View File

@ -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;
}