Repository: cloudstack Updated Branches: refs/heads/master ad640e2fd -> c61c636ce
CLOUDSTACK-5946: Commit 2774b62d64989bddc1e4664ef7a93dff11c77657 changed keystore file along with coverity fixes. Use varible name for keystore filename to keep it in sync Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c61c636c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c61c636c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c61c636c Branch: refs/heads/master Commit: c61c636ce8a1d74fd22d89026d40ba904fff6cf8 Parents: ad640e2 Author: Kishan Kavala <[email protected]> Authored: Fri Jul 25 14:07:46 2014 +0530 Committer: Kishan Kavala <[email protected]> Committed: Fri Jul 25 14:07:46 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/server/ConfigurationServerImpl.java | 3 ++- utils/src/com/cloud/utils/nio/Link.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c61c636c/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 7c3b5a5..5b75944 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -43,6 +43,7 @@ import javax.crypto.SecretKey; import javax.inject.Inject; import javax.naming.ConfigurationException; +import com.cloud.utils.nio.Link; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.apache.log4j.Logger; @@ -616,7 +617,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio if (null != confFile) { confPath = confFile.getParent(); - keystorePath = confPath + "/cloud.keystore"; + keystorePath = confPath + Link.keystoreFile; keystoreFile = new File(keystorePath); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c61c636c/utils/src/com/cloud/utils/nio/Link.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/nio/Link.java b/utils/src/com/cloud/utils/nio/Link.java index 39ca1d8..e0b4d7e 100755 --- a/utils/src/com/cloud/utils/nio/Link.java +++ b/utils/src/com/cloud/utils/nio/Link.java @@ -65,6 +65,7 @@ public class Link { private boolean _gotFollowingPacket; private SSLEngine _sslEngine; + public static String keystoreFile = "/cloudmanagementserver.keystore"; public Link(InetSocketAddress addr, NioConnection connection) { _addr = addr; @@ -417,7 +418,7 @@ public class Link { final Properties dbProps = DbProperties.getDbProperties(); char[] passphrase = dbProps.getProperty("db.cloud.keyStorePassphrase").toCharArray(); String confPath = confFile.getParent(); - String keystorePath = confPath + "/cloud.keystore"; + String keystorePath = confPath + keystoreFile; if (new File(keystorePath).exists()) { stream = new FileInputStream(keystorePath); } else {
