github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 13:01:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1388 from ioannidesalex/patch-6

Browse source 
Small fixes for exim
This commit is contained in:
Serghey Rodin 2017-12-29 01:04:15 +02:00 • committed by GitHub
commit d9ead934ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
install/ubuntu/16.04/exim/exim4.conf.template
View file

@ -112,7 +112,7 @@ acl_check_rcpt:
require message = relay not permitted require message = relay not permitted
domains = +local_domains : +relay_to_domains domains = +local_domains : +relay_to_domains
deny message = smtp auth requried deny message = smtp auth required
sender_domains = +local_domains sender_domains = +local_domains
!authenticated = * !authenticated = *
@ -145,9 +145,9 @@ acl_check_data:
.ifdef SPAMASSASSIN .ifdef SPAMASSASSIN
warn !authenticated = * warn !authenticated = *
hosts = !+relay_from_hosts hosts = !+relay_from_hosts
condition = ${if < {$message_size}{100K}} condition = ${if < {$message_size}{1024K}}
condition = ${if eq{$acl_m1}{yes}{yes}{no}} 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-Score: $spam_score_int
add_header = X-Spam-Bar: $spam_bar add_header = X-Spam-Bar: $spam_bar
add_header = X-Spam-Report: $spam_report add_header = X-Spam-Report: $spam_report