Merge pull request #18075 from nextcloud/backport/17696/stable17

[stable17] Remove objectstore credentials
2019-11-25 08:38:21 +01:00 · 2019-11-25 08:38:21 +01:00 · a0a9f702b0
parent 66ddb89180 956c459465
commit a0a9f702b0
1 changed files with 13 additions and 2 deletions
--- a/lib/private/SystemConfig.php
+++ b/lib/private/SystemConfig.php
@ -64,13 +64,24 @@ class SystemConfig {
 		],
 		'objectstore' => [
 			'arguments' => [
-				'password' => true,
+				// Legacy Swift (https://github.com/nextcloud/server/pull/17696#discussion_r341302207)
 				'options' => [
 					'credentials' => [
 						'key' => true,
 						'secret' => true,
 					]
-				]
+				],
+				// S3
+				'key' => true,
+				'secret' => true,
+				// Swift v2
+				'username' => true,
+				'password' => true,
+				// Swift v3
+				'user' => [
+					'name' => true,
+					'password' => true,
+				],
 			],
 		],
 	];