You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/07/10 12:22:21 UTC
git commit: updated refs/heads/master to d65f47c
Updated Branches:
refs/heads/master aed49572c -> d65f47c76
CLOUDSTACK-3438: update CPVM SSL certificate for both Premium and non-Premium cases
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d65f47c7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d65f47c7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d65f47c7
Branch: refs/heads/master
Commit: d65f47c76ad8c30dba186f414cb51d3f6c061088
Parents: aed4957
Author: Wei Zhou <w....@leaseweb.com>
Authored: Wed Jul 10 12:20:57 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Wed Jul 10 12:20:57 2013 +0200
----------------------------------------------------------------------
client/WEB-INF/web.xml | 2 ++
.../com/cloud/consoleproxy/AgentHookBase.java | 23 +++++++-------------
2 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d65f47c7/client/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml
index da2f13c..e5c05d3 100644
--- a/client/WEB-INF/web.xml
+++ b/client/WEB-INF/web.xml
@@ -45,11 +45,13 @@
<servlet>
<servlet-name>apiServlet</servlet-name>
<servlet-class>com.cloud.api.ApiServlet</servlet-class>
+ <load-on-startup>5</load-on-startup>
</servlet>
<servlet>
<servlet-name>consoleServlet</servlet-name>
<servlet-class>com.cloud.servlet.ConsoleProxyServlet</servlet-class>
+ <load-on-startup>6</load-on-startup>
</servlet>
<servlet>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d65f47c7/server/src/com/cloud/consoleproxy/AgentHookBase.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index 160810d..f051686 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -197,22 +197,15 @@ public abstract class AgentHookBase implements AgentHook {
@Override
public void startAgentHttpHandlerInVM(StartupProxyCommand startupCmd) {
StartConsoleProxyAgentHttpHandlerCommand cmd = null;
- if (_configDao.isPremium()) {
- String storePassword = String.valueOf(_random.nextLong());
- byte[] ksBits =
- _ksMgr.getKeystoreBits(ConsoleProxyManager.CERTIFICATE_NAME, ConsoleProxyManager.CERTIFICATE_NAME,
- storePassword);
-
- assert (ksBits != null);
- if (ksBits == null) {
- s_logger.error("Could not find and construct a valid SSL certificate");
- }
- cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword);
- cmd.setEncryptorPassword(getEncryptorPassword());
- } else {
- cmd = new StartConsoleProxyAgentHttpHandlerCommand();
- cmd.setEncryptorPassword(getEncryptorPassword());
+ String storePassword = String.valueOf(_random.nextLong());
+ byte[] ksBits = _ksMgr.getKeystoreBits(ConsoleProxyManager.CERTIFICATE_NAME, ConsoleProxyManager.CERTIFICATE_NAME, storePassword);
+
+ assert (ksBits != null);
+ if (ksBits == null) {
+ s_logger.error("Could not find and construct a valid SSL certificate");
}
+ cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword);
+ cmd.setEncryptorPassword(getEncryptorPassword());
try {