mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2025-08-03 17:44:49 +02:00
Support for setting relayhost in main.cf (#1104)
* Added DEFAULT_RELAY_HOST setting * If set this value will be used as the relayhost in /etc/postfix/maincf causing all mail to be delivered using this relay host * Test for default relay host setting
This commit is contained in:
parent
1302ccfe7e
commit
a3724fa91d
6 changed files with 49 additions and 1 deletions
12
Makefile
12
Makefile
|
@ -244,6 +244,15 @@ run:
|
|||
-e DMS_DEBUG=0 \
|
||||
-h mail.my-domain.com -t $(NAME)
|
||||
sleep 15
|
||||
docker run -d --name mail_with_default_relay \
|
||||
-v "`pwd`/test/config/relay-hosts":/tmp/docker-mailserver \
|
||||
-v "`pwd`/test":/tmp/docker-mailserver-test \
|
||||
-e DEFAULT_RELAY_HOST=default.relay.host.invalid:25 \
|
||||
--cap-add=SYS_PTRACE \
|
||||
-e PERMIT_DOCKER=host \
|
||||
-e DMS_DEBUG=0 \
|
||||
-h mail.my-domain.com -t $(NAME)
|
||||
sleep 15
|
||||
|
||||
generate-accounts-after-run:
|
||||
docker run --rm -e MAIL_USER=added@localhost.localdomain -e MAIL_PASS=mypassword -t $(NAME) /bin/sh -c 'echo "$$MAIL_USER|$$(doveadm pw -s SHA512-CRYPT -u $$MAIL_USER -p $$MAIL_PASS)"' >> test/config/postfix-accounts.cf
|
||||
|
@ -309,7 +318,8 @@ clean:
|
|||
mail_override_hostname \
|
||||
mail_domainname \
|
||||
mail_srs_domainname \
|
||||
mail_with_relays
|
||||
mail_with_relays \
|
||||
mail_with_default_relay
|
||||
|
||||
@if [ -d config.bak ]; then\
|
||||
rm -rf config ;\
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue