Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ece4c1e authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'main' of https://gitlab.e.foundation/e/infra/ecloud/nextcloud

parents cc16312f 0ca85121

Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -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}
@@ -245,6 +245,8 @@ RUN sed -i "s/field === 'displayname'//" ${BASE_DIR}/apps/settings/js/federation 


# Seds to allow deletion of LDAP users

RUN sed -i "s/return in_array(\$user->getBackendClassName(), \['Database', 'Guests'\]);/return in_array(\$user->getBackendClassName(), ['Database', 'Guests', 'LDAP']);/" ${BASE_DIR}/custom_apps/drop_account/lib/Service/DeletionCapabilityService.php

# Optimize user-count check: search with limit 2 instead of full count

RUN sed -i "s/return \$this->userManager->countUsers() < 2;/return count(\$this->userManager->search('', 2)) < 2;/" ${BASE_DIR}/custom_apps/drop_account/lib/Service/DeletionCapabilityService.php



# Add id to delete account settings section and hide it by default

RUN sed -i 's/"NcSettingsSection",{attrs:{/"NcSettingsSection",{attrs:{id:"delete-account-settings-section",style:"visibility:hidden;",/' ${BASE_DIR}/custom_apps/drop_account/js/drop_account-personal-settings.mjs

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

+7 −5
Original line number Diff line number Diff line
@@ -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,