From 45d6d16172a7bd1c9e9bc3b94d63f2b24dc013b9 Mon Sep 17 00:00:00 2001 From: Val Date: Sat, 25 Jul 2015 04:06:58 +0100 Subject: [PATCH] Amavis ip --- amavis/boot | 6 ++++++ email_core/boot.d/amavis | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/amavis/boot b/amavis/boot index 56022c7..9170403 100644 --- a/amavis/boot +++ b/amavis/boot @@ -1,4 +1,10 @@ #!/bin/bash + +# Update hostname if given +if [ -f /mail_settings/myhostname ]; then + echo $(sed 's:/:\\/:g' /mail_settings/myhostname) > /etc/mailname +fi + readarray -t domains < /mail_settings/domains first_fqdn="\$myhostname = \"${domains[0]}\";" domain_string=$(printf "'%s' " "${domains[@]}") | tr ' ' , diff --git a/email_core/boot.d/amavis b/email_core/boot.d/amavis index 22dd1b6..66389e1 100644 --- a/email_core/boot.d/amavis +++ b/email_core/boot.d/amavis @@ -49,7 +49,10 @@ function add_amavis () { echo " -o smtpd_recipient_restrictions=permit_mynetworks,reject" >> $POSTFIX_MASTER_CF echo " -o smtpd_data_restrictions=reject_unauth_pipelining" >> $POSTFIX_MASTER_CF echo " -o smtpd_end_of_data_restrictions=" >> $POSTFIX_MASTER_CF - echo " -o mynetworks=127.0.0.0/8 amavis" >> $POSTFIX_MASTER_CF + # Painfull way to get amavis IP + amavis_ip=$(getent hosts amavis | awk '{print $1}') + echo " -o mynetworks=127.0.0.0/8 $amavis_ip" >> $POSTFIX_MASTER_CF + echo " -o smtpd_error_sleep_time=0" >> $POSTFIX_MASTER_CF echo " -o smtpd_soft_error_limit=1001" >> $POSTFIX_MASTER_CF echo " -o smtpd_hard_error_limit=1000" >> $POSTFIX_MASTER_CF