mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2025-08-02 00:54:54 +02:00
* Add new configuration for multi-domain relay hosts (#922) * Creates new environment variables (replacing existing AWS_SES variables) * Optionally allows more advanced setups using config files * Update relay hosts during change detection (#922) * Add helper scripts for adding relay hosts and per-domain auth * Allow the possibility to deliver some mail directly * adding a domain with no destination will exclude it from the relayhost_map and so Postfix will attempt to deliver the mail directly * tests for setup.sh script * tests for relay host configuration * these tests cover the code in `start-mailserver.sh` dealing with both the env vars and the configuration files
This commit is contained in:
Paul Adams
Johan Smits
parent
86ea0bbae1
commit
f28e9843ce
13 changed files with 388 additions and 11 deletions
33
target/bin/addrelayhost
Executable file
33
target/bin/addrelayhost
Executable file
|
|
@ -0,0 +1,33 @@
|
|||
#! /bin/bash
|
||||
|
||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-relaymap.cf}
|
||||
|
||||
DOMAIN="$1"
|
||||
HOST="$2"
|
||||
PORT="$3"
|
||||
|
||||
usage() {
|
||||
echo "Usage: addrelayhost <domain> <host> [<port>]"
|
||||
}
|
||||
|
||||
errex() {
|
||||
echo "$@" 1>&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
escape() {
|
||||
echo "${1//./\\.}"
|
||||
}
|
||||
|
||||
[ -z "$DOMAIN" ] && { usage; errex "no domain specified"; }
|
||||
[ -z "$HOST" ] && { usage; errex "no relay host specified"; }
|
||||
|
||||
if [ -z "$PORT" ]; then
|
||||
PORT=25
|
||||
fi
|
||||
|
||||
if grep -qi "^@$DOMAIN" $DATABASE 2>/dev/null; then
|
||||
sed -i "s ^@"$DOMAIN".* "@$DOMAIN"\t\t["$HOST"]:"$PORT" " $DATABASE
|
||||
else
|
||||
echo -e "@$DOMAIN\t\t[$HOST]:$PORT" >> $DATABASE
|
||||
fi
|
||||
35
target/bin/addsaslpassword
Executable file
35
target/bin/addsaslpassword
Executable file
|
|
@ -0,0 +1,35 @@
|
|||
#! /bin/bash
|
||||
|
||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-sasl-password.cf}
|
||||
|
||||
DOMAIN="$1"
|
||||
USER="$2"
|
||||
PASSWD="$3"
|
||||
|
||||
usage() {
|
||||
echo "Usage: addsaslpassword <domain> <username> <password>"
|
||||
}
|
||||
|
||||
errex() {
|
||||
echo "$@" 1>&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
escape() {
|
||||
echo "${1//./\\.}"
|
||||
}
|
||||
|
||||
[ -z "$DOMAIN" ] && { usage; errex "no domain specified"; }
|
||||
[ -z "$USER" ] && { usage; errex "no username specified"; }
|
||||
|
||||
if [ -z "$PASSWD" ]; then
|
||||
read -s -p "Enter Password: " PASSWD
|
||||
echo
|
||||
[ -z "$PASSWD" ] && errex "Password must not be empty"
|
||||
fi
|
||||
|
||||
if grep -qi "^@$DOMAIN" $DATABASE 2>/dev/null; then
|
||||
sed -i "s ^@"$DOMAIN".* "@$DOMAIN"\t\t"$USER":"$PASSWD" " $DATABASE
|
||||
else
|
||||
echo -e "@$DOMAIN\t\t$USER:$PASSWD" >> $DATABASE
|
||||
fi
|
||||
22
target/bin/excluderelaydomain
Executable file
22
target/bin/excluderelaydomain
Executable file
|
|
@ -0,0 +1,22 @@
|
|||
#! /bin/bash
|
||||
|
||||
DATABASE=${DATABASE:-/tmp/docker-mailserver/postfix-relaymap.cf}
|
||||
|
||||
DOMAIN="$1"
|
||||
|
||||
usage() {
|
||||
echo "Usage: excluderelayhost <domain>"
|
||||
}
|
||||
|
||||
errex() {
|
||||
echo "$@" 1>&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
[ -z "$DOMAIN" ] && { usage; errex "no domain specified"; }
|
||||
|
||||
if grep -qi "^@$DOMAIN" $DATABASE 2>/dev/null; then
|
||||
sed -i "s/^@"$DOMAIN".*/@"$DOMAIN"/" $DATABASE
|
||||
else
|
||||
echo -e "@$DOMAIN" >> $DATABASE
|
||||
fi
|
||||
|
|
@ -51,6 +51,37 @@ if ! [ $resu_acc = "OK" ] || ! [ $resu_vir = "OK" ]; then
|
|||
chmod 640 /etc/dovecot/userdb
|
||||
sed -i -e '/\!include auth-ldap\.conf\.ext/s/^/#/' /etc/dovecot/conf.d/10-auth.conf
|
||||
sed -i -e '/\!include auth-passwdfile\.inc/s/^#//' /etc/dovecot/conf.d/10-auth.conf
|
||||
|
||||
# rebuild relay host
|
||||
if [ ! -z "$RELAY_HOST" ]; then
|
||||
# keep old config
|
||||
echo -n > /etc/postfix/sasl_passwd
|
||||
echo -n > /etc/postfix/relayhost_map
|
||||
if [ ! -z "$SASL_PASSWD" ]; then
|
||||
echo "$SASL_PASSWD" >> /etc/postfix/sasl_passwd
|
||||
fi
|
||||
# add domain-specific auth from config file
|
||||
if [ -f /tmp/docker-mailserver/postfix-sasl-password.cf ]; then
|
||||
while read line; do
|
||||
if ! echo "$line" | grep -q -e "\s*#"; then
|
||||
echo "$line" >> /etc/postfix/sasl_passwd
|
||||
fi
|
||||
done < /tmp/docker-mailserver/postfix-sasl-password.cf
|
||||
fi
|
||||
# add default relay
|
||||
if [ ! -z "$RELAY_USER" ] && [ ! -z "$RELAY_PASSWORD" ]; then
|
||||
echo "[$RELAY_HOST]:$RELAY_PORT $RELAY_USER:$RELAY_PASSWORD" >> /etc/postfix/sasl_passwd
|
||||
fi
|
||||
# add relay maps from file
|
||||
if [ -f /tmp/docker-mailserver/postfix-relaymap.cf ]; then
|
||||
while read line; do
|
||||
if ! echo "$line" | grep -q -e "\s*#"; then
|
||||
echo "$line" >> /etc/postfix/relayhost_map
|
||||
fi
|
||||
done < /tmp/docker-mailserver/postfix-relaymap.cf
|
||||
fi
|
||||
fi
|
||||
|
||||
# Creating users
|
||||
# 'pass' is encrypted
|
||||
# comments and empty lines are ignored
|
||||
|
|
@ -78,8 +109,22 @@ if ! [ $resu_acc = "OK" ] || ! [ $resu_vir = "OK" ]; then
|
|||
# Copy user provided sieve file, if present
|
||||
test -e /tmp/docker-mailserver/${login}.dovecot.sieve && cp /tmp/docker-mailserver/${login}.dovecot.sieve /var/mail/${domain}/${user}/.dovecot.sieve
|
||||
echo ${domain} >> /tmp/vhost.tmp
|
||||
# add domains to relayhost_map
|
||||
if [ ! -z "$RELAY_HOST" ]; then
|
||||
if ! grep -q -e "^@${domain}\s" /etc/postfix/relayhost_map; then
|
||||
echo "@${domain} [$RELAY_HOST]:$RELAY_PORT" >> /etc/postfix/relayhost_map
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if [ -f /etc/postfix/sasl_passwd ]; then
|
||||
chown root:root /etc/postfix/sasl_passwd
|
||||
chmod 0600 /etc/postfix/sasl_passwd
|
||||
fi
|
||||
if [ -f /etc/postfix/relayhost_map ]; then
|
||||
chown root:root /etc/postfix/relayhost_map
|
||||
chmod 0600 /etc/postfix/relayhost_map
|
||||
fi
|
||||
if [ -f postfix-virtual.cf ]; then
|
||||
# regen postfix aliases
|
||||
echo -n > /etc/postfix/virtual
|
||||
|
|
|
|||
|
|
@ -135,7 +135,11 @@ function register_functions() {
|
|||
_register_setup_function "_setup_postfix_access_control"
|
||||
|
||||
if [ ! -z "$AWS_SES_HOST" -a ! -z "$AWS_SES_USERPASS" ]; then
|
||||
_register_setup_function "_setup_postfix_relay_amazon_ses"
|
||||
_register_setup_function "_setup_postfix_relay_hosts"
|
||||
fi
|
||||
|
||||
if [ ! -z "$RELAY_HOST" ]; then
|
||||
_register_setup_function "_setup_postfix_relay_hosts"
|
||||
fi
|
||||
|
||||
if [ "$ENABLE_POSTFIX_VIRTUAL_TRANSPORT" = 1 ]; then
|
||||
|
|
@ -1001,22 +1005,102 @@ function _setup_postfix_sasl_password() {
|
|||
fi
|
||||
}
|
||||
|
||||
function _setup_postfix_relay_amazon_ses() {
|
||||
notify 'task' 'Setting up Postfix Relay Amazon SES'
|
||||
if [ -z "$AWS_SES_PORT" ];then
|
||||
AWS_SES_PORT=25
|
||||
function _setup_postfix_relay_hosts() {
|
||||
notify 'task' 'Setting up Postfix Relay Hosts'
|
||||
# copy old AWS_SES variables to new variables
|
||||
if [ -z "$RELAY_HOST" ]; then
|
||||
if [ ! -z "$AWS_SES_HOST" ]; then
|
||||
notify 'inf' "Using deprecated AWS_SES environment variables"
|
||||
RELAY_HOST=$AWS_SES_HOST
|
||||
fi
|
||||
fi
|
||||
notify 'inf' "Setting up outgoing email via AWS SES host $AWS_SES_HOST:$AWS_SES_PORT"
|
||||
echo "[$AWS_SES_HOST]:$AWS_SES_PORT $AWS_SES_USERPASS" >> /etc/postfix/sasl_passwd
|
||||
if [ -z "$RELAY_PORT" ]; then
|
||||
if [ -z "$AWS_SES_PORT" ]; then
|
||||
RELAY_PORT=25
|
||||
else
|
||||
RELAY_PORT=$AWS_SES_PORT
|
||||
fi
|
||||
fi
|
||||
if [ -z "$RELAY_USER" ]; then
|
||||
if [ ! -z "$AWS_SES_USERPASS" ]; then
|
||||
# NB this will fail if the password contains a colon!
|
||||
RELAY_USER=$(echo "$AWS_SES_USERPASS" | cut -f 1 -d ":")
|
||||
RELAY_PASSWORD=$(echo "$AWS_SES_USERPASS" | cut -f 2 -d ":")
|
||||
fi
|
||||
fi
|
||||
notify 'inf' "Setting up outgoing email relaying via $RELAY_HOST:$RELAY_PORT"
|
||||
|
||||
# setup /etc/postfix/sasl_passwd
|
||||
# --
|
||||
# @domain1.com postmaster@domain1.com:your-password-1
|
||||
# @domain2.com postmaster@domain2.com:your-password-2
|
||||
# @domain3.com postmaster@domain3.com:your-password-3
|
||||
#
|
||||
# [smtp.mailgun.org]:587 postmaster@domain2.com:your-password-2
|
||||
|
||||
if [ -f /tmp/docker-mailserver/postfix-sasl-password.cf ]; then
|
||||
notify 'inf' "Adding relay authentication from postfix-sasl-password.cf"
|
||||
while read line; do
|
||||
if ! echo "$line" | grep -q -e "\s*#"; then
|
||||
echo "$line" >> /etc/postfix/sasl_passwd
|
||||
fi
|
||||
done < /tmp/docker-mailserver/postfix-sasl-password.cf
|
||||
fi
|
||||
|
||||
# add default relay
|
||||
if [ ! -z "$RELAY_USER" ] && [ ! -z "$RELAY_PASSWORD" ]; then
|
||||
echo "[$RELAY_HOST]:$RELAY_PORT $RELAY_USER:$RELAY_PASSWORD" >> /etc/postfix/sasl_passwd
|
||||
else
|
||||
if [ ! -f /tmp/docker-mailserver/postfix-sasl-password.cf ]; then
|
||||
notify 'warn' "No relay auth file found and no default set"
|
||||
fi
|
||||
fi
|
||||
|
||||
chown root:root /etc/postfix/sasl_passwd
|
||||
chmod 0600 /etc/postfix/sasl_passwd
|
||||
# end /etc/postfix/sasl_passwd
|
||||
|
||||
# setup /etc/postfix/relayhost_map
|
||||
# --
|
||||
# @domain1.com [smtp.mailgun.org]:587
|
||||
# @domain2.com [smtp.mailgun.org]:587
|
||||
# @domain3.com [smtp.mailgun.org]:587
|
||||
|
||||
echo -n > /etc/postfix/relayhost_map
|
||||
|
||||
if [ -f /tmp/docker-mailserver/postfix-relaymap.cf ]; then
|
||||
notify 'inf' "Adding relay mappings from postfix-relaymap.cf"
|
||||
while read line; do
|
||||
if ! echo "$line" | grep -q -e "\s*#"; then
|
||||
echo "$line" >> /etc/postfix/relayhost_map
|
||||
fi
|
||||
done < /tmp/docker-mailserver/postfix-relaymap.cf
|
||||
fi
|
||||
grep -v "^\s*$\|^\s*\#" /tmp/docker-mailserver/postfix-accounts.cf | while IFS=$'|' read login pass
|
||||
do
|
||||
domain=$(echo ${login} | cut -d @ -f2)
|
||||
if ! grep -q -e "^@${domain}\b" /etc/postfix/relayhost_map; then
|
||||
notify 'inf' "Adding relay mapping for ${domain}"
|
||||
echo "@${domain} [$RELAY_HOST]:$RELAY_PORT" >> /etc/postfix/relayhost_map
|
||||
fi
|
||||
done
|
||||
# remove lines with no destination
|
||||
sed -i '/^@\S*\s*$/d' /etc/postfix/relayhost_map
|
||||
|
||||
chown root:root /etc/postfix/relayhost_map
|
||||
chmod 0600 /etc/postfix/relayhost_map
|
||||
# end /etc/postfix/relayhost_map
|
||||
|
||||
postconf -e \
|
||||
"relayhost = [$AWS_SES_HOST]:$AWS_SES_PORT" \
|
||||
"smtp_sasl_auth_enable = yes" \
|
||||
"smtp_sasl_security_options = noanonymous" \
|
||||
"smtp_sasl_password_maps = texthash:/etc/postfix/sasl_passwd" \
|
||||
"smtp_use_tls = yes" \
|
||||
"smtp_tls_security_level = encrypt" \
|
||||
"smtp_tls_note_starttls_offer = yes" \
|
||||
"smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt"
|
||||
"smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt" \
|
||||
"sender_dependent_relayhost_maps = texthash:/etc/postfix/relayhost_map" \
|
||||
"smtp_sender_dependent_authentication = yes"
|
||||
}
|
||||
|
||||
function _setup_postfix_dhparam() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue