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

fixes from ioannidesalex

Browse source
This commit is contained in:
Serghey Rodin 2017-12-29 01:14:21 +02:00
commit 04d4b4cb59
9 changed files with 59 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
install/ubuntu/12.04/exim/exim4.conf.template
View file

@ -8,6 +8,10 @@
#SPAM_SCORE = 50 #SPAM_SCORE = 50
#CLAMD = yes #CLAMD = yes
add_environment = <; PATH=/bin:/usr/bin
keep_environment =
disable_ipv6 = true
domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist local_domains = dsearch;/etc/exim4/domains/
domainlist relay_to_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/
hostlist relay_from_hosts = 127.0.0.1 hostlist relay_from_hosts = 127.0.0.1
@ -108,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 = *
@ -141,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

10
install/ubuntu/12.10/exim/exim4.conf.template
View file

@ -8,6 +8,10 @@
#SPAM_SCORE = 50 #SPAM_SCORE = 50
#CLAMD = yes #CLAMD = yes
add_environment = <; PATH=/bin:/usr/bin
keep_environment =
disable_ipv6 = true
domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist local_domains = dsearch;/etc/exim4/domains/
domainlist relay_to_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/
hostlist relay_from_hosts = 127.0.0.1 hostlist relay_from_hosts = 127.0.0.1
@ -108,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 = *
@ -141,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

10
install/ubuntu/13.04/exim/exim4.conf.template
View file

@ -8,6 +8,10 @@
#SPAM_SCORE = 50 #SPAM_SCORE = 50
#CLAMD = yes #CLAMD = yes
add_environment = <; PATH=/bin:/usr/bin
keep_environment =
disable_ipv6 = true
domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist local_domains = dsearch;/etc/exim4/domains/
domainlist relay_to_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/
hostlist relay_from_hosts = 127.0.0.1 hostlist relay_from_hosts = 127.0.0.1
@ -108,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 = *
@ -141,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

10
install/ubuntu/13.10/exim/exim4.conf.template
View file

@ -8,6 +8,10 @@
#SPAM_SCORE = 50 #SPAM_SCORE = 50
#CLAMD = yes #CLAMD = yes
add_environment = <; PATH=/bin:/usr/bin
keep_environment =
disable_ipv6 = true
domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist local_domains = dsearch;/etc/exim4/domains/
domainlist relay_to_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/
hostlist relay_from_hosts = 127.0.0.1 hostlist relay_from_hosts = 127.0.0.1
@ -108,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 = *
@ -141,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

10
install/ubuntu/14.04/exim/exim4.conf.template
View file

@ -8,6 +8,10 @@
#SPAM_SCORE = 50 #SPAM_SCORE = 50
#CLAMD = yes #CLAMD = yes
add_environment = <; PATH=/bin:/usr/bin
keep_environment =
disable_ipv6 = true
domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist local_domains = dsearch;/etc/exim4/domains/
domainlist relay_to_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/
hostlist relay_from_hosts = 127.0.0.1 hostlist relay_from_hosts = 127.0.0.1
@ -108,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 = *
@ -141,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

10
install/ubuntu/14.10/exim/exim4.conf.template
View file

@ -8,6 +8,10 @@
#SPAM_SCORE = 50 #SPAM_SCORE = 50
#CLAMD = yes #CLAMD = yes
add_environment = <; PATH=/bin:/usr/bin
keep_environment =
disable_ipv6 = true
domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist local_domains = dsearch;/etc/exim4/domains/
domainlist relay_to_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/
hostlist relay_from_hosts = 127.0.0.1 hostlist relay_from_hosts = 127.0.0.1
@ -108,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 = *
@ -141,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

10
install/ubuntu/15.04/exim/exim4.conf.template
View file

@ -8,6 +8,10 @@
#SPAM_SCORE = 50 #SPAM_SCORE = 50
#CLAMD = yes #CLAMD = yes
add_environment = <; PATH=/bin:/usr/bin
keep_environment =
disable_ipv6 = true
domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist local_domains = dsearch;/etc/exim4/domains/
domainlist relay_to_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/
hostlist relay_from_hosts = 127.0.0.1 hostlist relay_from_hosts = 127.0.0.1
@ -108,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 = *
@ -141,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

10
install/ubuntu/15.10/exim/exim4.conf.template
View file

@ -8,6 +8,10 @@
#SPAM_SCORE = 50 #SPAM_SCORE = 50
#CLAMD = yes #CLAMD = yes
add_environment = <; PATH=/bin:/usr/bin
keep_environment =
disable_ipv6 = true
domainlist local_domains = dsearch;/etc/exim4/domains/ domainlist local_domains = dsearch;/etc/exim4/domains/
domainlist relay_to_domains = dsearch;/etc/exim4/domains/ domainlist relay_to_domains = dsearch;/etc/exim4/domains/
hostlist relay_from_hosts = 127.0.0.1 hostlist relay_from_hosts = 127.0.0.1
@ -108,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 = *
@ -141,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

6
install/ubuntu/16.10/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