diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-11-07 09:14:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 09:14:42 +0100 |
| commit | 03d9e05bb518700083466fc2aaec6592280f7113 (patch) | |
| tree | d44fe324d5f2bf493ba9cd06e44b2c1ad15610ad | |
| parent | f886d2f5995e65a20d94143f19c1cdea3ea25692 (diff) | |
| parent | f81c6adad6bb0c67bdf4325a15e90a210d2e4ff2 (diff) | |
| download | nextcloud-server-03d9e05bb518700083466fc2aaec6592280f7113.tar.gz nextcloud-server-03d9e05bb518700083466fc2aaec6592280f7113.zip | |
Merge pull request #17696 from nextcloud/enh/17659/hide-objectstore-credentials
Remove objectstore credentials
| -rw-r--r-- | lib/private/SystemConfig.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php index 444e5842437..64cc805f9f3 100644 --- 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, + ], ], ], ]; |