wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjustment of the configuration parameters

Browse source
This commit is contained in:
Christian Berendt 2013-10-22 13:34:24 +02:00
parent 67779680a6
commit f0d04f3ac6
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/files_external/lib/config.php
View file

@ -84,14 +84,21 @@ class OC_Mount_Config {
'token' => '#token'), 'token' => '#token'),
'custom' => 'google'); 'custom' => 'google');
$backends['\OC\Files\Storage\SWIFT']=array( if(OC_Mount_Config::checkcurl()) {
'backend' => 'OpenStack Swift', $backends['\OC\Files\Storage\Swift'] = array(
'configuration' => array( 'backend' => 'OpenStack Object Storage',
'host' => 'URL', 'configuration' => array(
'user' => 'Username', 'user' => 'Username',
'token' => '*Token', 'bucket' => 'Bucket',
'root' => '&Root', 'region' => 'Region',
'secure' => '!Secure ftps://')); '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_Util::runningOnWindows()) {
if (OC_Mount_Config::checksmbclient()) { if (OC_Mount_Config::checksmbclient()) {

14
apps/files_external/tests/config.php
View file

@ -31,11 +31,15 @@ return array(
'token' => '', 'token' => '',
), ),
'swift'=>array( 'swift'=>array(
'run'=>false, 'run' => false,
'user'=>'test:tester', 'user' => 'test',
'token'=>'testing', 'bucket' => 'test',
'host'=>'localhost.local:8080/auth', 'region' => 'DFW',
'root'=>'/', '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( 'smb'=>array(
'run'=>false, 'run'=>false,