diff options
| -rwxr-xr-x | apps/files_external/lib/config.php | 23 | ||||
| -rw-r--r-- | apps/files_external/tests/config.php | 14 |
2 files changed, 24 insertions, 13 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 659959e662e..65d541c4b16 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -84,14 +84,21 @@ class OC_Mount_Config { 'token' => '#token'), 'custom' => 'google'); - $backends['\OC\Files\Storage\SWIFT']=array( - 'backend' => 'OpenStack Swift', - 'configuration' => array( - 'host' => 'URL', - 'user' => 'Username', - 'token' => '*Token', - 'root' => '&Root', - 'secure' => '!Secure ftps://')); + if(OC_Mount_Config::checkcurl()) { + $backends['\OC\Files\Storage\Swift'] = array( + 'backend' => 'OpenStack Object Storage', + 'configuration' => array( + 'user' => 'Username', + 'bucket' => 'Bucket', + 'region' => 'Region', + 'key' => '*API Key (Rackspace Cloud Files)', + 'tenant' => 'Tenantname (OpenStack Object Storage)', + 'password' => '*Password (OpenStack Object Storage)', + 'service_name' => 'Service Name (OpenStack Object Storage)', + 'url' => 'URL of identity endpoint (OpenStack Object Storage)' + ) + ); + } if (!OC_Util::runningOnWindows()) { if (OC_Mount_Config::checksmbclient()) { diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php index d4a69d29c0f..57653d05d00 100644 --- a/apps/files_external/tests/config.php +++ b/apps/files_external/tests/config.php @@ -31,11 +31,15 @@ return array( 'token' => '', ), 'swift'=>array( - 'run'=>false, - 'user'=>'test:tester', - 'token'=>'testing', - 'host'=>'localhost.local:8080/auth', - 'root'=>'/', + 'run' => false, + 'user' => 'test', + 'bucket' => 'test', + 'region' => 'DFW', + 'key' => 'test', //to be used only with Rackspace Cloud Files + //'tenant' => 'test', //to be used only with OpenStack Object Storage + //'password' => 'test', //to be use only with OpenStack Object Storage + //'service_name' => 'swift', //should be 'swift' for OpenStack Object Storage and 'cloudFiles' for Rackspace Cloud Files (default value) + //'url' => 'https://identity.api.rackspacecloud.com/v2.0/' //to be used with Rackspace Cloud Files and OpenStack Object Storage ), 'smb'=>array( 'run'=>false, |