diff options
author | Vincent Petry <vincent@nextcloud.com> | 2022-08-29 14:47:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-29 14:47:58 +0200 |
commit | 1b577d348b32149b06493dd860a937ec8b7a6cc2 (patch) | |
tree | 3f5a24c7c7c0b0ccbf2ea7b8396bcaddc9b179a2 /apps | |
parent | 5422051f18d2abba4c6ca080a68cb32501b978d1 (diff) | |
parent | c2b206db645bd9a7b69f2485b9d75b1252271795 (diff) | |
download | nextcloud-server-1b577d348b32149b06493dd860a937ec8b7a6cc2.tar.gz nextcloud-server-1b577d348b32149b06493dd860a937ec8b7a6cc2.zip |
Merge pull request #33500 from nextcloud/encryption-system-mount
add marker interface to mark system mount points for encryption
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files_external/lib/Config/ConfigAdapter.php | 2 | ||||
-rw-r--r-- | apps/files_external/lib/Config/SystemMountPoint.php | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/apps/files_external/lib/Config/ConfigAdapter.php b/apps/files_external/lib/Config/ConfigAdapter.php index 57faf91fcdc..7f7c5e3e2eb 100644 --- a/apps/files_external/lib/Config/ConfigAdapter.php +++ b/apps/files_external/lib/Config/ConfigAdapter.php @@ -163,7 +163,7 @@ class ConfigAdapter implements IMountProvider { $storageConfig->getId() ); } else { - return new ExternalMountPoint( + return new SystemMountPoint( $storageConfig, $storage, '/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(), diff --git a/apps/files_external/lib/Config/SystemMountPoint.php b/apps/files_external/lib/Config/SystemMountPoint.php new file mode 100644 index 00000000000..7de07699164 --- /dev/null +++ b/apps/files_external/lib/Config/SystemMountPoint.php @@ -0,0 +1,30 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2022 Robin Appelman <robin@icewind.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OCA\Files_External\Config; + + +use OCP\Files\Mount\ISystemMountPoint; + +class SystemMountPoint extends ExternalMountPoint implements ISystemMountPoint { +} |