diff --git a/fail2ban/entrypoint.sh b/fail2ban/entrypoint.sh index 766a5a0..63eba0a 100644 --- a/fail2ban/entrypoint.sh +++ b/fail2ban/entrypoint.sh @@ -30,7 +30,7 @@ fi # Send email if [ \$ABUSE_ADDR ]; then swaks -f \$SENDER_MAIL -t \"\$ABUSE_ADDR,webmaster@$DOMAIN\" --tlsc -au $USER -ap $PASS -s $SMTP -p 465 \\ ---h-Subject \"[Urgent]: Automatic abuse report for IP address \$REMOTE_IP from $DOMAIN, please read\" --h-From \"Fail2Ban $DOMAIN <\$SENDER_MAIL>\" \\ +--h-Subject \"[Urgent]: Automatic abuse report for IP address \$REMOTE_IP from $DOMAIN\" --h-From \"Fail2Ban $DOMAIN <\$SENDER_MAIL>\" \\ --h-Bcc \"webmaster@$DOMAIN\" --h-To \$ABUSE_ADDR --body \\ \"This is an automatic email abuse report about the IP address \$REMOTE_IP generated at \$DATE, please do not reply. You get this email because you are listed as the official and popular abuse email contact for this concrete IP address. diff --git a/fail2ban_abuse_mail.sh b/fail2ban_abuse_mail.sh index 7185d10..9e0d9cb 100755 --- a/fail2ban_abuse_mail.sh +++ b/fail2ban_abuse_mail.sh @@ -23,9 +23,8 @@ fi # Send email if [ $ABUSE_ADDR ]; then -#sendmail -t -i -f $SENDER_MAIL $ABUSE_ADDR << EOF swaks -f $SENDER_MAIL -t "$ABUSE_ADDR" --tlsc -au fail2ban -ap pass -s mail.hatthieves.es -p 465 \ ---h-Subject "[Urgent]: Automatic abuse report for IP address $REMOTE_IP from hatthieves.es, please read" --h-From "Fail2Ban hatthieves.es <$SENDER_MAIL>" \ +--h-Subject "[Urgent]: Automatic abuse report for IP address $REMOTE_IP from hatthieves.es" --h-From "Fail2Ban hatthieves.es <$SENDER_MAIL>" \ --h-Bcc "webmail@hatthieves.es" --h-To $ABUSE_ADDR --body \ "This is an automatic email abuse report about the IP address $REMOTE_IP generated at $DATE, please do not reply. You get this email because you are listed as the official and popular abuse email contact for this concrete IP address.