self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-09-16 09:06:32 +02:00
Code Issues Releases Activity

Merge #2195

Browse Source 
2195: roundcube: Add /overrides directory in include r=mergify[bot] a=mnival

Added the /overrides directory in the roundcube config.inc.php file

## What type of PR?

bug-fix

## What does this PR do?

### Related issue(s)
none

Co-authored-by: mnival <1595998+mnival@users.noreply.github.com>
Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
This commit is contained in:
bors[bot]
2022-02-18 10:42:17 +00:00
committed by GitHub
parent b73963aae5 731a3741ca
commit bcecbda9de
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/faq.rst
View File

@@ -267,6 +267,7 @@ correct syntax. The following file names will be taken as override configuration
- `Dovecot`_ - ``dovecot.conf`` in dovecot sub-directory; - `Dovecot`_ - ``dovecot.conf`` in dovecot sub-directory;
- `Nginx`_ - All ``*.conf`` files in the ``nginx`` sub-directory; - `Nginx`_ - All ``*.conf`` files in the ``nginx`` sub-directory;
- `Rspamd`_ - All files in the ``rspamd`` 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>`). 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>`).

1
towncrier/newsfragments/2195.bugfix Normal file
View File

@@ -0,0 +1 @@
Added the /overrides directory in the roundcube config.inc.php file

2
webmails/roundcube/config.inc.php
View File

@@ -61,6 +61,6 @@ $config['mdn_use_from'] = true;
// includes // includes
{%- for inc in INCLUDES %} {%- for inc in INCLUDES %}
include('{{ inc }}'); include('/overrides/{{ inc }}');
{%- endfor %} {%- endfor %}