diff --git a/admin_manual/configuration_files/primary_storage.rst b/admin_manual/configuration_files/primary_storage.rst index 0d6be0ae85c..65fe1b906e5 100644 --- a/admin_manual/configuration_files/primary_storage.rst +++ b/admin_manual/configuration_files/primary_storage.rst @@ -41,12 +41,12 @@ The configuration has the following structure: :: - 'objectstore' => array( + 'objectstore' => [ 'class' => 'Object\\Storage\\Backend\\Class', - 'arguments' => array( + 'arguments' => [ ... - ), - ), + ], + ], ~~~~~~~~~~~~~~~ OpenStack Swift @@ -63,9 +63,9 @@ V2 Authentication: :: - 'objectstore' => array( + 'objectstore' => [ 'class' => '\\OC\\Files\\ObjectStore\\Swift', - 'arguments' => array( + 'arguments' => [ 'username' => 'username', 'password' => 'Secr3tPaSSWoRdt7', // the container to store the data in @@ -79,30 +79,38 @@ V2 Authentication: 'serviceName' => 'swift', // The Interface / url Type, optional 'urlType' => 'internal' - ), - ), + ], + ], V3 Authentication: :: - 'objectstore' => array( + 'objectstore' => [ 'class' => 'OC\\Files\\ObjectStore\\Swift', - 'arguments' => array( + 'arguments' => [ 'autocreate' => true, 'user' => [ 'name' => 'swift', 'password' => 'Secr3tPaSSWoRdt7', 'domain' => [ - 'name' => 'default' - ] + 'name' => 'Default', + ], + ], + 'scope' => [ + 'project' => [ + 'name' => 'OS_PROJECT_NAME', + 'domain' => [ + 'name' => 'Default', + ], + ], ], 'serviceName' => 'swift', 'region' => 'regionOne', - 'url' => "http://example.com/v3", - 'bucket' => 'nextcloud' - ) - ), + 'url' => 'http://example.com/v3', + 'bucket' => 'nextcloud', + ], + ], ~~~~~~~~~~~~~~~~~~~~~~~~~~~ Simple Storage Service (S3) @@ -116,9 +124,9 @@ The class to be used is :code:`\\OC\\Files\\ObjectStore\\S3` :: - 'objectstore' => array( + 'objectstore' => [ 'class' => '\\OC\\Files\\ObjectStore\\S3', - 'arguments' => array( + 'arguments' => [ 'bucket' => 'nextcloud', 'autocreate' => true, 'key' => 'EJ39ITYZEUH5BGWDRUFY', @@ -129,8 +137,8 @@ The class to be used is :code:`\\OC\\Files\\ObjectStore\\S3` 'region' => 'optional', // required for some non Amazon S3 implementations 'use_path_style'=>true - ), - ), + ], + ], .. note:: Not all configuration options are required for all S3 servers. Overriding the hostname, port and region of your S3 server is only required for