scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-31 10:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reflect override settings for postfix

Browse Source 
Also added a stumbling stone when changing postfix.cf

(cherry picked from commit 1f2aee278c)

# Conflicts:
#	docs/faq.rst
This commit is contained in:
Linus Gasser
2021-05-13 18:59:18 +02:00
committed by Mergify
parent 6b5bb5fcd1
commit 906d47a6da
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/faq.rst
View File

@@ -250,16 +250,21 @@ Postfix, Dovecot, Nginx and Rspamd support overriding configuration files. Overr
correct syntax. The following file names will be taken as override configuration: correct syntax. The following file names will be taken as override configuration:
- `Postfix`_ : - `Postfix`_ :
- ``main.cf`` as ``$ROOT/overrides/postfix/postfix.cf`` - ``main.cf`` as ``$ROOT/overrides/postfix.cf``
- ``master.cf`` as ``$ROOT/overrides/postfix/postfix.master`` - ``master.cf`` as ``$ROOT/overrides/postfix.master``
- All ``$ROOT/overrides/postfix/*.map`` files - All ``$ROOT/overrides/postfix/*.map`` files
- For both ``postfix.cf`` and ``postfix.master``, you need to put one configuration per line, as they are fed line-by-line - For both ``postfix.cf`` and ``postfix.master``, you need to put one configuration per line, as they are fed line-by-line
to postfix. to postfix.
<<<<<<< HEAD
- ``logrotate.conf`` as ``$ROOT/overrides/postfix/logrotate.conf`` - Replaces the logrotate.conf file used for rotating ``POSTFIX_LOG_FILE``. - ``logrotate.conf`` as ``$ROOT/overrides/postfix/logrotate.conf`` - Replaces the logrotate.conf file used for rotating ``POSTFIX_LOG_FILE``.
- `Dovecot`_ - ``dovecot.conf`` in dovecot sub-directory. - `Dovecot`_ - ``dovecot.conf`` in dovecot sub-directory.
- `Nginx`_ : - `Nginx`_ :
- All ``*.conf`` files in the ``nginx`` sub-directory. - All ``*.conf`` files in the ``nginx`` sub-directory.
- ``proxy.conf`` in the ``nginx/dovecot`` sub-directory. - ``proxy.conf`` in the ``nginx/dovecot`` sub-directory.
=======
- `Dovecot`_ - ``dovecot.conf`` in dovecot sub-directory;
- `Nginx`_ - All ``*.conf`` files in the ``nginx`` sub-directory;
>>>>>>> 1f2aee27 (Reflect override settings for postfix)
- `Rspamd`_ - All files in the ``rspamd`` sub-directory. - `Rspamd`_ - All files in the ``rspamd`` sub-directory.
- `Roundcube`_ - All ``*.inc.php`` files in the ``roundcube`` sub directory. - `Roundcube`_ - All ``*.inc.php`` files in the ``roundcube`` sub directory.