fix: 038 patch file (288bd3c6) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.ph
		RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch
		RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch
		#RUN patch -u ${BASE_DIR}/custom_apps/snappymail/app/snappymail/v/2.38.2+murena-20251112/app/libraries/RainLoop/Actions/Contacts.php -i ${TMP_PATCH_DIR}/037-snappymail-contact.patch
		RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/038-appdata-folder-based-on-config.patch
		RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/038-appdata-folder-based-on-config.patch
		RUN rm -rf ${TMP_PATCH_DIR}

patches/038-appdata-folder-based-on-config.patch

+12 −15

Original line number	Diff line number	Diff line
		diff --git a/config/config.sample.php b/config/config.sample.php
		index 82acd43e9d9..5620c3c0156 100644
		--- a/config/config.sample.php
		+++ b/config/config.sample.php
		@@ -2291,6 +2291,15 @@ $CONFIG = [
		diff --git config/config.sample.php config/config.sample-new.php
		--- config/config.sample.php 2025-02-13 19:30:40
		+++ config/config.sample-new.php 2025-02-13 19:31:40
		@@ -2291,6 +2291,15 @@
		*/
		'updatedirectory' => '',

		@@ -18,11 +17,10 @@ index 82acd43e9d9..5620c3c0156 100644
		/**
		* Block specific files or filenames, disallowing uploads or access (read and write).
		* ``.htaccess`` is blocked by default.
		diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
		index e058be0663b..fb8fb01d69a 100644
		--- a/lib/private/Files/SetupManager.php
		+++ b/lib/private/Files/SetupManager.php
		@@ -429,10 +429,26 @@ class SetupManager implements ISetupManager {
		diff --git lib/private/Files/SetupManager.php lib/private/Files/SetupManager-new.php
		--- lib/private/Files/SetupManager.php 2025-02-13 19:32:40
		+++ lib/private/Files/SetupManager-new.php 2025-02-13 19:33:40
		@@ -429,10 +429,26 @@
		foreach ($rootMounts as $rootMountProvider) {
		$this->mountManager->addMount($rootMountProvider);
		}
		@@ -50,11 +48,10 @@ index e058be0663b..fb8fb01d69a 100644
		/**
		* Get the user to setup for a path or `null` if the root needs to be setup
		*
		diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php
		index 7e8946f4d05..b59b979d7b5 100644
		--- a/lib/private/SystemConfig.php
		+++ b/lib/private/SystemConfig.php
		@@ -20,6 +20,7 @@ class SystemConfig {
		diff --git lib/private/SystemConfig.php lib/private/SystemConfig-new.php
		--- lib/private/SystemConfig.php 2025-02-13 19:34:40
		+++ lib/private/SystemConfig-new.php 2025-02-13 19:35:40
		@@ -20,6 +20,7 @@
		protected const DEFAULT_SENSITIVE_VALUES = [
		'instanceid' => true,
		'datadirectory' => true,