pedro/cdist-contrib-pedro-fork
1
0
Fork 0
forked from ungleich-public/cdist-contrib
Code Issues Pull requests Projects Releases Wiki Activity

[type/__dma] Use "smarthost" spelling to be consistent with DMA

Browse source
This commit is contained in:
Dennis Camera 2020-06-09 14:44:54 +02:00
parent de4508cb06
commit 0cd19b3a5d
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
type/__dma/gencode-remote
View file

@ -22,9 +22,9 @@ fi
# Generate config # Generate config
conf_should=$( conf_should=$(
if test -s "${__object}/parameter/smart-host" if test -s "${__object}/parameter/smarthost"
then then
printf 'SMARTHOST %s\n' "$(cat "${__object}/parameter/smart-host")" printf 'SMARTHOST %s\n' "$(cat "${__object}/parameter/smarthost")"
fi fi
printf 'MAILNAME %s\n' "${mailname}" printf 'MAILNAME %s\n' "${mailname}"
@ -85,8 +85,8 @@ conf_should=$(
if test -f "${__object}/parameter/null-client" if test -f "${__object}/parameter/null-client"
then then
test -s "${__object}/parameter/smart-host" || { test -s "${__object}/parameter/smarthost" || {
echo '--null-client requires a --smart-host to be defined' >&2 echo '--null-client requires a --smarthost to be defined' >&2
exit 1 exit 1
} }

14
type/__dma/man.rst
View file

@ -13,15 +13,15 @@ mails from locally installed Mail User Agents (MUA) and deliver the mails
to a remote destination. to a remote destination.
Remote delivery happens over TLS to one or more mailboxes that are local to the Remote delivery happens over TLS to one or more mailboxes that are local to the
email server configured in the `smart-host` parameter. mail server configured in the ``smarthost`` parameter.
REQUIRED PARAMETERS REQUIRED PARAMETERS
------------------- -------------------
smart-host smarthost
The email server used to send email. The mail server used to send email.
It must be configured to act as a relay for the host being configured by It must be configured to act as a relay for the host being configured by
this type so that mail can be sent to users non-local to the smart-host. this type so that mail can be sent to users non-local to the smarthost.
BOOLEAN PARAMETERS BOOLEAN PARAMETERS
@ -33,7 +33,7 @@ full-bounce
not just the headers. not just the headers.
null-client null-client
Enable to bypass aliases and local delivery, and instead forward all mails Enable to bypass aliases and local delivery, and instead forward all mails
to the defined `--smart-host`. to the defined ``--smarthost``.
send-test-email send-test-email
If present, after setup this type will send an email to root, to allow you If present, after setup this type will send an email to root, to allow you
to easily test your setup. to easily test your setup.
@ -78,9 +78,7 @@ EXAMPLES
.. code-block:: sh .. code-block:: sh
__dma \ __dma --smarthost mx1.domain.tld --send-test-email
--smart-host mx1.domain.tld \
--send-test-email
SEE ALSO SEE ALSO

2
type/__dma/parameter/required
View file

@ -1 +1 @@
smart-host smarthost