From 6a57fdefe98fbd29e1aaf40ba17c30d76e32bab6 Mon Sep 17 00:00:00 2001
From: Charles Provent <charlesprovent+github@labsys.xyz>
Date: Thu, 27 Feb 2020 13:36:02 +0100
Subject: [PATCH] Add example Swift v3 scope

Add an example of Swift V3 with a configuration scope following this commit :
https://github.com/nextcloud/server/pull/9280
---
 .../configuration_files/primary_storage.rst   | 60 +++++++++++++++----
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/admin_manual/configuration_files/primary_storage.rst b/admin_manual/configuration_files/primary_storage.rst
index bc5c366a2cb..eb2d4329396 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
@@ -57,11 +57,15 @@ server into the virtual filesystem.
 
 The class to be used is :code:`\\OC\\Files\\ObjectStore\\Swift`
 
+Both openstack v2 and v3 authentication are supported,
+
+V2 Authentication:
+
 ::
 
-	'objectstore' => array(
+	'objectstore' => [
 		'class' => '\\OC\\Files\\ObjectStore\\Swift',
-		'arguments' => array(
+		'arguments' => [
 			'username' => 'username',
 			'password' => 'Secr3tPaSSWoRdt7',
 			// the container to store the data in
@@ -75,8 +79,38 @@ The class to be used is :code:`\\OC\\Files\\ObjectStore\\Swift`
 			'serviceName' => 'swift',
 			// The Interface / url Type, optional
 			'urlType' => 'internal'
-		),
-	),
+		],
+	],
+
+V3 Authentication:
+
+::
+
+	'objectstore' => [
+		'class' => 'OC\\Files\\ObjectStore\\Swift',
+		'arguments' => [
+			'autocreate' => true,
+			'user' => [
+				'name' => 'swift',
+				'password' => 'Secr3tPaSSWoRdt7',
+				'domain' => [
+					'name' => 'Default',
+				],
+			],
+			'scope' => [
+				'project' => [
+					'name' => 'OS_PROJECT_NAME',
+					'domain' => [
+						'name' => 'Default',
+					],
+				],
+			],
+			'serviceName' => 'swift',
+			'region' => 'regionOne',
+			'url' => 'http://example.com/v3',
+			'bucket' => 'nextcloud',
+		],
+	],
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Simple Storage Service (S3)
@@ -90,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',
@@ -103,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
@@ -123,4 +157,4 @@ Multibucket Object Store
 It's possible to configure Nextcloud to distribute its data over multiple buckets
 for scalability purpose. You can find out more information about upscaling with
 object storage and Nextcloud in the
-`Nextcloud customer portal <https://portal.nextcloud.com/article/object-store-as-primary-storage-16.html>`_.
+`Nextcloud customer portal <https://portal.nextcloud.com/article/object-store-as-primary-storage-16.html>`_.
\ No newline at end of file