Skip to content

Commit

Permalink
Revert "Allow customizations to Roundcube settings to persist between…
Browse files Browse the repository at this point in the history
… updates by including a configuration override file, if it exists (mail-in-a-box#2333)"

This reverts commit 1b8cdeb.

It didn't execute. I should have tried it first.
  • Loading branch information
JoshData committed Mar 10, 2024
1 parent 0b1d923 commit 18b8f9a
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions setup/webmail.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down

0 comments on commit 18b8f9a

Please sign in to comment.