From eae8500a86f99fc399d06a3a6c6db4a3877f4a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 10 Dec 2015 14:37:53 +0100 Subject: [PATCH] make url type configurable --- config/config.sample.php | 2 ++ lib/private/files/objectstore/swift.php | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) 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']);