From b21f62f3963d3f9577dfa087deecd9e8194bdb58 Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Mon, 6 Apr 2026 12:25:30 +0600
Subject: [PATCH] chore: re-enable config based appdata folder location

- re-enable config for dynamic appdata location. This is needed for
purfomance on objectStore setup
- update the patch file to support on nc-32.0.6 base
---
 Dockerfile                                       |  2 +-
 patches/038-appdata-folder-based-on-config.patch | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7205d5c..b8d4a34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -179,7 +179,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 -p0 < ${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}
 
 
diff --git a/patches/038-appdata-folder-based-on-config.patch b/patches/038-appdata-folder-based-on-config.patch
index edd1aa6..8015631 100644
--- a/patches/038-appdata-folder-based-on-config.patch
+++ b/patches/038-appdata-folder-based-on-config.patch
@@ -4,13 +4,12 @@ Subject: [PATCH] Enable appdata folder location can be set up dynamatically
 
 We want to setup appdata folder dynamatically using config. This is specially needed for objectStore setup, so appdata files can be locally accessable, which minimize loadtime. The `appdatadirectory` new config value is introduced by this patch.
 
---- lib/private/Files/SetupManager.php	2026-03-05 16:26:59.175816848 +0600
-+++ lib/private/Files/SetupManager-new.php	2026-03-05 16:26:46.271803100 +0600
-@@ -429,10 +429,26 @@
- 		foreach ($rootMounts as $rootMountProvider) {
+--- lib/private/Files/SetupManager.php	2026-04-06 12:18:14.646640387 +0600
++++ lib/private/Files/SetupManager-new.php	2026-04-06 12:18:04.826550349 +0600
+@@ -345,9 +345,26 @@
  			$this->mountManager->addMount($rootMountProvider);
  		}
--
+
 +		$this->setupAppData();
  		$this->eventLogger->end('fs:setup:root');
  	}
@@ -34,6 +33,7 @@ We want to setup appdata folder dynamatically using config. This is specially ne
  	/**
  	 * Get the user to setup for a path or `null` if the root needs to be setup
  	 *
+
 --- lib/private/SystemConfig.php	2026-03-05 16:30:25.597831789 +0600
 +++ lib/private/SystemConfig-new.php	2026-03-05 16:30:12.022966268 +0600
 @@ -20,6 +20,7 @@
@@ -44,3 +44,5 @@ We want to setup appdata folder dynamatically using config. This is specially ne
  		'dbname' => true,
  		'dbhost' => true,
  		'dbpassword' => true,
+
+
-- 
GitLab