Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EB5FA110FF for ; Fri, 25 Apr 2014 21:50:55 +0000 (UTC) Received: (qmail 79259 invoked by uid 500); 25 Apr 2014 21:50:55 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 79205 invoked by uid 500); 25 Apr 2014 21:50:55 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 79198 invoked by uid 99); 25 Apr 2014 21:50:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Apr 2014 21:50:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D936E952689; Fri, 25 Apr 2014 21:50:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nitin@apache.org To: commits@cloudstack.apache.org Message-Id: <2bc8866cfecc40b7ad5518aa21d7e68d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4-forward to 7694bee Date: Fri, 25 Apr 2014 21:50:54 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4-forward 092b4be8d -> 7694bee83 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 (cherry picked from commit 05802004e27f91f4c23274ca123f1ecf9fde5ac2) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7694bee8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7694bee8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7694bee8 Branch: refs/heads/4.4-forward Commit: 7694bee83f53a16537032bed3902ef8b4f95c4ab Parents: 092b4be Author: Amogh Vasekar Authored: Fri Apr 25 14:48:15 2014 -0700 Committer: Nitin Mehta Committed: Fri Apr 25 14:50:37 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/7694bee8/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 4781010..ac0fe5e 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -211,8 +211,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.");