cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/master to 0580200
Date Fri, 25 Apr 2014 21:49:35 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 744e2a54e -> 05802004e


In 4.3, SSL was turned off by default.
However, for SSVM, the value from configuration server overrides the default in Config.java.
Work around is to change in global properties.

Local testing, checking a fresh install has the above property false by default.

Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05802004
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05802004
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05802004

Branch: refs/heads/master
Commit: 05802004e27f91f4c23274ca123f1ecf9fde5ac2
Parents: 744e2a5
Author: Amogh Vasekar <amogh.vasekar@citrix.com>
Authored: Fri Apr 25 14:48:15 2014 -0700
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Fri Apr 25 14:48:36 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/server/ConfigurationServerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05802004/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 8f8f4c1..2d465a9 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -212,8 +212,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
             _configDao.update(Config.UseSecondaryStorageVm.key(), Config.UseSecondaryStorageVm.getCategory(),
"true");
             s_logger.debug("ConfigurationServer made secondary storage vm required.");
 
-            _configDao.update(Config.SecStorageEncryptCopy.key(), Config.SecStorageEncryptCopy.getCategory(),
"true");
-            s_logger.debug("ConfigurationServer made secondary storage copy encrypted.");
+            _configDao.update(Config.SecStorageEncryptCopy.key(), Config.SecStorageEncryptCopy.getCategory(),
"false");
+            s_logger.debug("ConfigurationServer made secondary storage copy encrypt set to
false.");
 
             _configDao.update("secstorage.secure.copy.cert", "realhostip");
             s_logger.debug("ConfigurationServer made secondary storage copy use realhostip.");


Mime
View raw message