From 18b8f9ab4bfe38ba6d0555bbb0dfbe4eab0a5b4e Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sun, 10 Mar 2024 08:25:13 -0400
Subject: [PATCH] Revert "Allow customizations to Roundcube settings to persist
 between updates by including a configuration override file, if it exists
 (#2333)"

This reverts commit 1b8cdeb644bb1f5471e715bb63d024313d3e96f2.

It didn't execute. I should have tried it first.
---
 setup/webmail.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/setup/webmail.sh b/setup/webmail.sh
index a663ebd0e..680427892 100755
--- a/setup/webmail.sh
+++ b/setup/webmail.sh
@@ -145,9 +145,6 @@ cat > $RCM_CONFIG <<EOF;
 \$config['session_path'] = '/mail/';
 /* prevent CSRF, requires php 7.3+ */
 \$config['session_samesite'] = 'Strict';
-/* Persist Customizations */
-\$file = __DIR__.'/config_override.inc.php';
-\if(file_exists($file)) { include $file; }
 ?>
 EOF
 
@@ -169,9 +166,6 @@ cat > ${RCM_PLUGIN_DIR}/carddav/config.inc.php <<EOF;
 	 'preemptive_auth' => '1',
 	 'hide'        =>  false,
 );
-/* Persist Customizations */
-\$file = __DIR__.'/config_override.inc.php';
-\if(file_exists($file)) { include $file; }
 ?>
 EOF