From 4b9781210f10f9730ce70e24ad47b3616ee359f4 Mon Sep 17 00:00:00 2001
From: mnival <1595998+mnival@users.noreply.github.com>
Date: Fri, 28 Jan 2022 16:02:27 +0100
Subject: [PATCH 1/3] Add /overrides directory in include

---
 webmails/roundcube/config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webmails/roundcube/config.inc.php b/webmails/roundcube/config.inc.php
index b02c527e..a7b742f5 100644
--- a/webmails/roundcube/config.inc.php
+++ b/webmails/roundcube/config.inc.php
@@ -61,6 +61,6 @@ $config['mdn_use_from'] = true;
 
 // includes
 {%- for inc in INCLUDES %}
-include('{{ inc }}');
+include('/overrides/{{ inc }}');
 {%- endfor %}
 

From 42118109fb17bfb678052d15a0100c85b5682b36 Mon Sep 17 00:00:00 2001
From: mnival <1595998+mnival@users.noreply.github.com>
Date: Sun, 30 Jan 2022 09:06:47 +0100
Subject: [PATCH 2/3] Create 2195.bugfix

---
 towncrier/newsfragments/2195.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 towncrier/newsfragments/2195.bugfix

diff --git a/towncrier/newsfragments/2195.bugfix b/towncrier/newsfragments/2195.bugfix
new file mode 100644
index 00000000..5f0616a2
--- /dev/null
+++ b/towncrier/newsfragments/2195.bugfix
@@ -0,0 +1 @@
+Added the /overrides directory in the roundcube config.inc.php file

From 731a3741ca264ec679a8826929489fb2aa8985b7 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Thu, 17 Feb 2022 14:28:41 +0000
Subject: [PATCH 3/3] Update overrides faq for include roundcube

---
 docs/faq.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/faq.rst b/docs/faq.rst
index 3194ee36..d547991d 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -267,6 +267,7 @@ correct syntax. The following file names will be taken as override configuration
 - `Dovecot`_ - ``dovecot.conf`` in dovecot sub-directory;
 - `Nginx`_ - All ``*.conf`` files in the ``nginx`` sub-directory;
 - `Rspamd`_ - All files in the ``rspamd`` sub-directory.
+- Roundcube - All ``*.inc`` files in the ``roundcube`` sub directory.
 
 To override the root location (``/``) in Nginx ``WEBROOT_REDIRECT`` needs to be set to ``none`` in the env file (see :ref:`web settings <web_settings>`).