Skip to content

Commit 04d4b4c

Browse files
author
Serghey Rodin
committed
fixes from ioannidesalex
1 parent 5c4c53b commit 04d4b4c

File tree

9 files changed

+59
-27
lines changed

9 files changed

+59
-27
lines changed

‎install/ubuntu/12.04/exim/exim4.conf.template‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#SPAM_SCORE = 50
99
#CLAMD = yes
1010

11+
add_environment = <; PATH=/bin:/usr/bin
12+
keep_environment =
13+
disable_ipv6 = true
14+
1115
domainlist local_domains = dsearch;/etc/exim4/domains/
1216
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
1317
hostlist relay_from_hosts = 127.0.0.1
@@ -108,7 +112,7 @@ acl_check_rcpt:
108112
require message = relay not permitted
109113
domains = +local_domains : +relay_to_domains
110114

111-
deny message = smtp auth requried
115+
deny message = smtp auth required
112116
sender_domains = +local_domains
113117
!authenticated = *
114118

@@ -141,9 +145,9 @@ acl_check_data:
141145
.ifdef SPAMASSASSIN
142146
warn !authenticated = *
143147
hosts = !+relay_from_hosts
144-
condition = ${if < {$message_size}{100K}}
148+
condition = ${if < {$message_size}{1024K}}
145149
condition = ${if eq{$acl_m1}{yes}{yes}{no}}
146-
spam = nobody:true/defer_ok
150+
spam = debian-spamd:true/defer_ok
147151
add_header = X-Spam-Score: $spam_score_int
148152
add_header = X-Spam-Bar: $spam_bar
149153
add_header = X-Spam-Report: $spam_report

‎install/ubuntu/12.10/exim/exim4.conf.template‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#SPAM_SCORE = 50
99
#CLAMD = yes
1010

11+
add_environment = <; PATH=/bin:/usr/bin
12+
keep_environment =
13+
disable_ipv6 = true
14+
1115
domainlist local_domains = dsearch;/etc/exim4/domains/
1216
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
1317
hostlist relay_from_hosts = 127.0.0.1
@@ -108,7 +112,7 @@ acl_check_rcpt:
108112
require message = relay not permitted
109113
domains = +local_domains : +relay_to_domains
110114

111-
deny message = smtp auth requried
115+
deny message = smtp auth required
112116
sender_domains = +local_domains
113117
!authenticated = *
114118

@@ -141,9 +145,9 @@ acl_check_data:
141145
.ifdef SPAMASSASSIN
142146
warn !authenticated = *
143147
hosts = !+relay_from_hosts
144-
condition = ${if < {$message_size}{100K}}
148+
condition = ${if < {$message_size}{1024K}}
145149
condition = ${if eq{$acl_m1}{yes}{yes}{no}}
146-
spam = nobody:true/defer_ok
150+
spam = debian-spamd:true/defer_ok
147151
add_header = X-Spam-Score: $spam_score_int
148152
add_header = X-Spam-Bar: $spam_bar
149153
add_header = X-Spam-Report: $spam_report

‎install/ubuntu/13.04/exim/exim4.conf.template‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#SPAM_SCORE = 50
99
#CLAMD = yes
1010

11+
add_environment = <; PATH=/bin:/usr/bin
12+
keep_environment =
13+
disable_ipv6 = true
14+
1115
domainlist local_domains = dsearch;/etc/exim4/domains/
1216
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
1317
hostlist relay_from_hosts = 127.0.0.1
@@ -108,7 +112,7 @@ acl_check_rcpt:
108112
require message = relay not permitted
109113
domains = +local_domains : +relay_to_domains
110114

111-
deny message = smtp auth requried
115+
deny message = smtp auth required
112116
sender_domains = +local_domains
113117
!authenticated = *
114118

@@ -141,9 +145,9 @@ acl_check_data:
141145
.ifdef SPAMASSASSIN
142146
warn !authenticated = *
143147
hosts = !+relay_from_hosts
144-
condition = ${if < {$message_size}{100K}}
148+
condition = ${if < {$message_size}{1024K}}
145149
condition = ${if eq{$acl_m1}{yes}{yes}{no}}
146-
spam = nobody:true/defer_ok
150+
spam = debian-spamd:true/defer_ok
147151
add_header = X-Spam-Score: $spam_score_int
148152
add_header = X-Spam-Bar: $spam_bar
149153
add_header = X-Spam-Report: $spam_report

‎install/ubuntu/13.10/exim/exim4.conf.template‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#SPAM_SCORE = 50
99
#CLAMD = yes
1010

11+
add_environment = <; PATH=/bin:/usr/bin
12+
keep_environment =
13+
disable_ipv6 = true
14+
1115
domainlist local_domains = dsearch;/etc/exim4/domains/
1216
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
1317
hostlist relay_from_hosts = 127.0.0.1
@@ -108,7 +112,7 @@ acl_check_rcpt:
108112
require message = relay not permitted
109113
domains = +local_domains : +relay_to_domains
110114

111-
deny message = smtp auth requried
115+
deny message = smtp auth required
112116
sender_domains = +local_domains
113117
!authenticated = *
114118

@@ -141,9 +145,9 @@ acl_check_data:
141145
.ifdef SPAMASSASSIN
142146
warn !authenticated = *
143147
hosts = !+relay_from_hosts
144-
condition = ${if < {$message_size}{100K}}
148+
condition = ${if < {$message_size}{1024K}}
145149
condition = ${if eq{$acl_m1}{yes}{yes}{no}}
146-
spam = nobody:true/defer_ok
150+
spam = debian-spamd:true/defer_ok
147151
add_header = X-Spam-Score: $spam_score_int
148152
add_header = X-Spam-Bar: $spam_bar
149153
add_header = X-Spam-Report: $spam_report

‎install/ubuntu/14.04/exim/exim4.conf.template‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#SPAM_SCORE = 50
99
#CLAMD = yes
1010

11+
add_environment = <; PATH=/bin:/usr/bin
12+
keep_environment =
13+
disable_ipv6 = true
14+
1115
domainlist local_domains = dsearch;/etc/exim4/domains/
1216
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
1317
hostlist relay_from_hosts = 127.0.0.1
@@ -108,7 +112,7 @@ acl_check_rcpt:
108112
require message = relay not permitted
109113
domains = +local_domains : +relay_to_domains
110114

111-
deny message = smtp auth requried
115+
deny message = smtp auth required
112116
sender_domains = +local_domains
113117
!authenticated = *
114118

@@ -141,9 +145,9 @@ acl_check_data:
141145
.ifdef SPAMASSASSIN
142146
warn !authenticated = *
143147
hosts = !+relay_from_hosts
144-
condition = ${if < {$message_size}{100K}}
148+
condition = ${if < {$message_size}{1024K}}
145149
condition = ${if eq{$acl_m1}{yes}{yes}{no}}
146-
spam = nobody:true/defer_ok
150+
spam = debian-spamd:true/defer_ok
147151
add_header = X-Spam-Score: $spam_score_int
148152
add_header = X-Spam-Bar: $spam_bar
149153
add_header = X-Spam-Report: $spam_report

‎install/ubuntu/14.10/exim/exim4.conf.template‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#SPAM_SCORE = 50
99
#CLAMD = yes
1010

11+
add_environment = <; PATH=/bin:/usr/bin
12+
keep_environment =
13+
disable_ipv6 = true
14+
1115
domainlist local_domains = dsearch;/etc/exim4/domains/
1216
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
1317
hostlist relay_from_hosts = 127.0.0.1
@@ -108,7 +112,7 @@ acl_check_rcpt:
108112
require message = relay not permitted
109113
domains = +local_domains : +relay_to_domains
110114

111-
deny message = smtp auth requried
115+
deny message = smtp auth required
112116
sender_domains = +local_domains
113117
!authenticated = *
114118

@@ -141,9 +145,9 @@ acl_check_data:
141145
.ifdef SPAMASSASSIN
142146
warn !authenticated = *
143147
hosts = !+relay_from_hosts
144-
condition = ${if < {$message_size}{100K}}
148+
condition = ${if < {$message_size}{1024K}}
145149
condition = ${if eq{$acl_m1}{yes}{yes}{no}}
146-
spam = nobody:true/defer_ok
150+
spam = debian-spamd:true/defer_ok
147151
add_header = X-Spam-Score: $spam_score_int
148152
add_header = X-Spam-Bar: $spam_bar
149153
add_header = X-Spam-Report: $spam_report

‎install/ubuntu/15.04/exim/exim4.conf.template‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#SPAM_SCORE = 50
99
#CLAMD = yes
1010

11+
add_environment = <; PATH=/bin:/usr/bin
12+
keep_environment =
13+
disable_ipv6 = true
14+
1115
domainlist local_domains = dsearch;/etc/exim4/domains/
1216
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
1317
hostlist relay_from_hosts = 127.0.0.1
@@ -108,7 +112,7 @@ acl_check_rcpt:
108112
require message = relay not permitted
109113
domains = +local_domains : +relay_to_domains
110114

111-
deny message = smtp auth requried
115+
deny message = smtp auth required
112116
sender_domains = +local_domains
113117
!authenticated = *
114118

@@ -141,9 +145,9 @@ acl_check_data:
141145
.ifdef SPAMASSASSIN
142146
warn !authenticated = *
143147
hosts = !+relay_from_hosts
144-
condition = ${if < {$message_size}{100K}}
148+
condition = ${if < {$message_size}{1024K}}
145149
condition = ${if eq{$acl_m1}{yes}{yes}{no}}
146-
spam = nobody:true/defer_ok
150+
spam = debian-spamd:true/defer_ok
147151
add_header = X-Spam-Score: $spam_score_int
148152
add_header = X-Spam-Bar: $spam_bar
149153
add_header = X-Spam-Report: $spam_report

‎install/ubuntu/15.10/exim/exim4.conf.template‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#SPAM_SCORE = 50
99
#CLAMD = yes
1010

11+
add_environment = <; PATH=/bin:/usr/bin
12+
keep_environment =
13+
disable_ipv6 = true
14+
1115
domainlist local_domains = dsearch;/etc/exim4/domains/
1216
domainlist relay_to_domains = dsearch;/etc/exim4/domains/
1317
hostlist relay_from_hosts = 127.0.0.1
@@ -108,7 +112,7 @@ acl_check_rcpt:
108112
require message = relay not permitted
109113
domains = +local_domains : +relay_to_domains
110114

111-
deny message = smtp auth requried
115+
deny message = smtp auth required
112116
sender_domains = +local_domains
113117
!authenticated = *
114118

@@ -141,9 +145,9 @@ acl_check_data:
141145
.ifdef SPAMASSASSIN
142146
warn !authenticated = *
143147
hosts = !+relay_from_hosts
144-
condition = ${if < {$message_size}{100K}}
148+
condition = ${if < {$message_size}{1024K}}
145149
condition = ${if eq{$acl_m1}{yes}{yes}{no}}
146-
spam = nobody:true/defer_ok
150+
spam = debian-spamd:true/defer_ok
147151
add_header = X-Spam-Score: $spam_score_int
148152
add_header = X-Spam-Bar: $spam_bar
149153
add_header = X-Spam-Report: $spam_report

‎install/ubuntu/16.10/exim/exim4.conf.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ acl_check_rcpt:
112112
require message = relay not permitted
113113
domains = +local_domains : +relay_to_domains
114114

115-
deny message = smtp auth requried
115+
deny message = smtp auth required
116116
sender_domains = +local_domains
117117
!authenticated = *
118118

@@ -145,9 +145,9 @@ acl_check_data:
145145
.ifdef SPAMASSASSIN
146146
warn !authenticated = *
147147
hosts = !+relay_from_hosts
148-
condition = ${if < {$message_size}{100K}}
148+
condition = ${if < {$message_size}{1024K}}
149149
condition = ${if eq{$acl_m1}{yes}{yes}{no}}
150-
spam = nobody:true/defer_ok
150+
spam = debian-spamd:true/defer_ok
151151
add_header = X-Spam-Score: $spam_score_int
152152
add_header = X-Spam-Bar: $spam_bar
153153
add_header = X-Spam-Report: $spam_report

0 commit comments

Comments
 (0)