From 04d4b4cb597508cccd6e5604bc5f9910f1eea2b8 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 29 Dec 2017 01:14:21 +0200 Subject: [PATCH] fixes from ioannidesalex --- install/ubuntu/12.04/exim/exim4.conf.template | 10 +++++++--- install/ubuntu/12.10/exim/exim4.conf.template | 10 +++++++--- install/ubuntu/13.04/exim/exim4.conf.template | 10 +++++++--- install/ubuntu/13.10/exim/exim4.conf.template | 10 +++++++--- install/ubuntu/14.04/exim/exim4.conf.template | 10 +++++++--- install/ubuntu/14.10/exim/exim4.conf.template | 10 +++++++--- install/ubuntu/15.04/exim/exim4.conf.template | 10 +++++++--- install/ubuntu/15.10/exim/exim4.conf.template | 10 +++++++--- install/ubuntu/16.10/exim/exim4.conf.template | 6 +++--- 9 files changed, 59 insertions(+), 27 deletions(-) diff --git a/install/ubuntu/12.04/exim/exim4.conf.template b/install/ubuntu/12.04/exim/exim4.conf.template index 40bc0251..fc346486 100644 --- a/install/ubuntu/12.04/exim/exim4.conf.template +++ b/install/ubuntu/12.04/exim/exim4.conf.template @@ -8,6 +8,10 @@ #SPAM_SCORE = 50 #CLAMD = yes +add_environment = <; PATH=/bin:/usr/bin +keep_environment = +disable_ipv6 = true + domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/ hostlist relay_from_hosts = 127.0.0.1 @@ -108,7 +112,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth requried + deny message = smtp auth required sender_domains = +local_domains !authenticated = * @@ -141,9 +145,9 @@ acl_check_data: .ifdef SPAMASSASSIN warn !authenticated = * hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} + condition = ${if < {$message_size}{1024K}} condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok + spam = debian-spamd:true/defer_ok add_header = X-Spam-Score: $spam_score_int add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Report: $spam_report diff --git a/install/ubuntu/12.10/exim/exim4.conf.template b/install/ubuntu/12.10/exim/exim4.conf.template index 40bc0251..fc346486 100644 --- a/install/ubuntu/12.10/exim/exim4.conf.template +++ b/install/ubuntu/12.10/exim/exim4.conf.template @@ -8,6 +8,10 @@ #SPAM_SCORE = 50 #CLAMD = yes +add_environment = <; PATH=/bin:/usr/bin +keep_environment = +disable_ipv6 = true + domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/ hostlist relay_from_hosts = 127.0.0.1 @@ -108,7 +112,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth requried + deny message = smtp auth required sender_domains = +local_domains !authenticated = * @@ -141,9 +145,9 @@ acl_check_data: .ifdef SPAMASSASSIN warn !authenticated = * hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} + condition = ${if < {$message_size}{1024K}} condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok + spam = debian-spamd:true/defer_ok add_header = X-Spam-Score: $spam_score_int add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Report: $spam_report diff --git a/install/ubuntu/13.04/exim/exim4.conf.template b/install/ubuntu/13.04/exim/exim4.conf.template index 40bc0251..fc346486 100644 --- a/install/ubuntu/13.04/exim/exim4.conf.template +++ b/install/ubuntu/13.04/exim/exim4.conf.template @@ -8,6 +8,10 @@ #SPAM_SCORE = 50 #CLAMD = yes +add_environment = <; PATH=/bin:/usr/bin +keep_environment = +disable_ipv6 = true + domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/ hostlist relay_from_hosts = 127.0.0.1 @@ -108,7 +112,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth requried + deny message = smtp auth required sender_domains = +local_domains !authenticated = * @@ -141,9 +145,9 @@ acl_check_data: .ifdef SPAMASSASSIN warn !authenticated = * hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} + condition = ${if < {$message_size}{1024K}} condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok + spam = debian-spamd:true/defer_ok add_header = X-Spam-Score: $spam_score_int add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Report: $spam_report diff --git a/install/ubuntu/13.10/exim/exim4.conf.template b/install/ubuntu/13.10/exim/exim4.conf.template index 40bc0251..fc346486 100644 --- a/install/ubuntu/13.10/exim/exim4.conf.template +++ b/install/ubuntu/13.10/exim/exim4.conf.template @@ -8,6 +8,10 @@ #SPAM_SCORE = 50 #CLAMD = yes +add_environment = <; PATH=/bin:/usr/bin +keep_environment = +disable_ipv6 = true + domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/ hostlist relay_from_hosts = 127.0.0.1 @@ -108,7 +112,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth requried + deny message = smtp auth required sender_domains = +local_domains !authenticated = * @@ -141,9 +145,9 @@ acl_check_data: .ifdef SPAMASSASSIN warn !authenticated = * hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} + condition = ${if < {$message_size}{1024K}} condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok + spam = debian-spamd:true/defer_ok add_header = X-Spam-Score: $spam_score_int add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Report: $spam_report diff --git a/install/ubuntu/14.04/exim/exim4.conf.template b/install/ubuntu/14.04/exim/exim4.conf.template index 40bc0251..fc346486 100644 --- a/install/ubuntu/14.04/exim/exim4.conf.template +++ b/install/ubuntu/14.04/exim/exim4.conf.template @@ -8,6 +8,10 @@ #SPAM_SCORE = 50 #CLAMD = yes +add_environment = <; PATH=/bin:/usr/bin +keep_environment = +disable_ipv6 = true + domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/ hostlist relay_from_hosts = 127.0.0.1 @@ -108,7 +112,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth requried + deny message = smtp auth required sender_domains = +local_domains !authenticated = * @@ -141,9 +145,9 @@ acl_check_data: .ifdef SPAMASSASSIN warn !authenticated = * hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} + condition = ${if < {$message_size}{1024K}} condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok + spam = debian-spamd:true/defer_ok add_header = X-Spam-Score: $spam_score_int add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Report: $spam_report diff --git a/install/ubuntu/14.10/exim/exim4.conf.template b/install/ubuntu/14.10/exim/exim4.conf.template index 40bc0251..fc346486 100644 --- a/install/ubuntu/14.10/exim/exim4.conf.template +++ b/install/ubuntu/14.10/exim/exim4.conf.template @@ -8,6 +8,10 @@ #SPAM_SCORE = 50 #CLAMD = yes +add_environment = <; PATH=/bin:/usr/bin +keep_environment = +disable_ipv6 = true + domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/ hostlist relay_from_hosts = 127.0.0.1 @@ -108,7 +112,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth requried + deny message = smtp auth required sender_domains = +local_domains !authenticated = * @@ -141,9 +145,9 @@ acl_check_data: .ifdef SPAMASSASSIN warn !authenticated = * hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} + condition = ${if < {$message_size}{1024K}} condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok + spam = debian-spamd:true/defer_ok add_header = X-Spam-Score: $spam_score_int add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Report: $spam_report diff --git a/install/ubuntu/15.04/exim/exim4.conf.template b/install/ubuntu/15.04/exim/exim4.conf.template index 40bc0251..fc346486 100644 --- a/install/ubuntu/15.04/exim/exim4.conf.template +++ b/install/ubuntu/15.04/exim/exim4.conf.template @@ -8,6 +8,10 @@ #SPAM_SCORE = 50 #CLAMD = yes +add_environment = <; PATH=/bin:/usr/bin +keep_environment = +disable_ipv6 = true + domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/ hostlist relay_from_hosts = 127.0.0.1 @@ -108,7 +112,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth requried + deny message = smtp auth required sender_domains = +local_domains !authenticated = * @@ -141,9 +145,9 @@ acl_check_data: .ifdef SPAMASSASSIN warn !authenticated = * hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} + condition = ${if < {$message_size}{1024K}} condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok + spam = debian-spamd:true/defer_ok add_header = X-Spam-Score: $spam_score_int add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Report: $spam_report diff --git a/install/ubuntu/15.10/exim/exim4.conf.template b/install/ubuntu/15.10/exim/exim4.conf.template index 40bc0251..fc346486 100644 --- a/install/ubuntu/15.10/exim/exim4.conf.template +++ b/install/ubuntu/15.10/exim/exim4.conf.template @@ -8,6 +8,10 @@ #SPAM_SCORE = 50 #CLAMD = yes +add_environment = <; PATH=/bin:/usr/bin +keep_environment = +disable_ipv6 = true + domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/ hostlist relay_from_hosts = 127.0.0.1 @@ -108,7 +112,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth requried + deny message = smtp auth required sender_domains = +local_domains !authenticated = * @@ -141,9 +145,9 @@ acl_check_data: .ifdef SPAMASSASSIN warn !authenticated = * hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} + condition = ${if < {$message_size}{1024K}} condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok + spam = debian-spamd:true/defer_ok add_header = X-Spam-Score: $spam_score_int add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Report: $spam_report diff --git a/install/ubuntu/16.10/exim/exim4.conf.template b/install/ubuntu/16.10/exim/exim4.conf.template index d5cf0c7e..fc346486 100644 --- a/install/ubuntu/16.10/exim/exim4.conf.template +++ b/install/ubuntu/16.10/exim/exim4.conf.template @@ -112,7 +112,7 @@ acl_check_rcpt: require message = relay not permitted domains = +local_domains : +relay_to_domains - deny message = smtp auth requried + deny message = smtp auth required sender_domains = +local_domains !authenticated = * @@ -145,9 +145,9 @@ acl_check_data: .ifdef SPAMASSASSIN warn !authenticated = * hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} + condition = ${if < {$message_size}{1024K}} condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok + spam = debian-spamd:true/defer_ok add_header = X-Spam-Score: $spam_score_int add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Report: $spam_report