cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/4.2 to e23b103
Date Tue, 26 Nov 2013 13:11:04 GMT
Updated Branches:
  refs/heads/4.2 888ddd724 -> e23b10319


CLOUDSTACK-2940: Allowing Replacement of realhostip.com with a customized domain for SSVM


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

Branch: refs/heads/4.2
Commit: e23b10319f55fe8cbb822c0c29dc64b56509c119
Parents: 888ddd7
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Tue Nov 26 14:10:51 2013 +0100
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Tue Nov 26 14:10:51 2013 +0100

----------------------------------------------------------------------
 .../datastore/driver/CloudStackImageStoreDriverImpl.java      | 7 ++++++-
 .../src/com/cloud/storage/download/DownloadMonitorImpl.java   | 2 +-
 server/src/com/cloud/storage/upload/UploadMonitorImpl.java    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e23b1031/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
index cfb9e2d..4796653 100644
--- a/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
+++ b/plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
@@ -103,12 +103,17 @@ public class CloudStackImageStoreDriverImpl extends BaseImageStoreDriverImpl
{
         String scheme = "http";
         boolean _sslCopy = false;
         String sslCfg = _configDao.getValue(Config.SecStorageEncryptCopy.toString());
+        String _ssvmUrlDomain = _configDao.getValue("secstorage.ssl.cert.domain");
         if ( sslCfg != null ){
             _sslCopy = Boolean.parseBoolean(sslCfg);
         }
         if (_sslCopy) {
             hostname = ipAddress.replace(".", "-");
-            hostname = hostname + ".realhostip.com";
+            if(_ssvmUrlDomain != null && _ssvmUrlDomain.length() > 0){
+                hostname = hostname + "." + _ssvmUrlDomain;
+            } else {
+                hostname = hostname + ".realhostip.com";
+            }
             scheme = "https";
         }
         return scheme + "://" + hostname + "/userdata/" + uuid;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e23b1031/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index 0bb1a86..d449abc 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -105,7 +105,7 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor
 
     @Override
     public boolean configure(String name, Map<String, Object> params) {
-        final Map<String, String> configs = _configDao.getConfiguration("ManagementServer",
params);
+        final Map<String, String> configs = _configDao.getConfiguration("management-server",
params);
         _sslCopy = Boolean.parseBoolean(configs.get("secstorage.encrypt.copy"));
         _proxy = configs.get(Config.SecStorageProxy.key());
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e23b1031/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
index b6dcc79..7163b7e 100755
--- a/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
+++ b/server/src/com/cloud/storage/upload/UploadMonitorImpl.java
@@ -368,7 +368,7 @@ public class UploadMonitorImpl extends ManagerBase implements UploadMonitor
{
 	@Override
 	public boolean configure(String name, Map<String, Object> params)
 			throws ConfigurationException {
-        final Map<String, String> configs = _configDao.getConfiguration("ManagementServer",
params);
+        final Map<String, String> configs = _configDao.getConfiguration("management-server",
params);
         _sslCopy = Boolean.parseBoolean(configs.get("secstorage.encrypt.copy"));
 
         String cert = configs.get("secstorage.secure.copy.cert");


Mime
View raw message