Verified Commit 69c56883 authored by Maciej Delmanowski's avatar Maciej Delmanowski

Merge branch 'drybjed-nullmailer-rework'

parents 92e129d6 00cfaef5
Pipeline #17159062 passed with stages
in 9 minutes and 15 seconds
......@@ -136,7 +136,9 @@ nullmailer__relayhost: 'smtp.{{ nullmailer__domain }}'
# .. envvar:: nullmailer__relayhost_options [[[
#
# Additional options set for the default relayhost in the
# :file:`/etc/nullmailer/remotes` configuration file.
# :file:`/etc/nullmailer/remotes` configuration file. You can specify either
# a YAML dictionary with parameters used by other :command:`nullmailer`
# remotes, or a YAML list with "raw" :command:`nullmailer` options.
# See :ref:`nullmailer__ref_remotes` for more details.
nullmailer__relayhost_options: []
......@@ -146,8 +148,11 @@ nullmailer__relayhost_options: []
# The default list of SMTP servers where ``nullmailer`` forwards all mail
# messages. See :ref:`nullmailer__ref_remotes` for more details.
nullmailer__default_remotes:
- host: '{{ nullmailer__relayhost }}'
options: '{{ nullmailer__relayhost_options }}'
- '{{ (nullmailer__relayhost_options | combine({"host": nullmailer__relayhost}))
if (nullmailer__relayhost_options is mapping)
else ({"host": nullmailer__relayhost,
"options": nullmailer__relayhost_options}) }}'
# ]]]
# .. envvar:: nullmailer__remotes [[[
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment