summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2015-12-10 14:37:53 +0100
committerJörn Friedrich Dreyer <jfd@butonic.de>2015-12-11 10:19:28 +0100
commiteae8500a86f99fc399d06a3a6c6db4a3877f4a4f (patch)
tree73243b48e227e02d52deb9c0c734676ee85afdc4
parentacce1638e5c06e0a3c98a0450fd82df9574524dc (diff)
downloadnextcloud-server-eae8500a86f99fc399d06a3a6c6db4a3877f4a4f.tar.gz
nextcloud-server-eae8500a86f99fc399d06a3a6c6db4a3877f4a4f.zip
make url type configurable
-rw-r--r--config/config.sample.php2
-rw-r--r--lib/private/files/objectstore/swift.php6
2 files changed, 7 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php
index 9b10792944f..89b6f6833c1 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -974,6 +974,8 @@ $CONFIG = array(
// dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
// if omitted
'serviceName' => 'swift',
+ // The Interface / url Type, optional
+ 'urlType' => 'internal'
),
),
diff --git a/lib/private/files/objectstore/swift.php b/lib/private/files/objectstore/swift.php
index 89ef40360a7..162b17a066c 100644
--- a/lib/private/files/objectstore/swift.php
+++ b/lib/private/files/objectstore/swift.php
@@ -77,7 +77,11 @@ class Swift implements IObjectStore {
$serviceName = $this->params['serviceName'];
}
- $this->objectStoreService = $this->client->objectStoreService($serviceName, $this->params['region']);
+ $urlType = null;
+ if ($this->params['urlType']) {
+ $urlType = $this->params['urlType'];
+ }
+ $this->objectStoreService = $this->client->objectStoreService($serviceName, $this->params['region'], $urlType);
try {
$this->container = $this->objectStoreService->getContainer($this->params['container']);