diff --git a/install/0.9.7/rhel/exim.conf b/install/0.9.7/rhel/exim.conf index a30496b59..5647ac021 100644 --- a/install/0.9.7/rhel/exim.conf +++ b/install/0.9.7/rhel/exim.conf @@ -1,12 +1,13 @@ ########################################################################## -SPAMASSASSIN = yes +#SPAMASSASSIN = yes SPAM_SCORE = 10 -CLAMD = yes +#CLAMD = yes ########################################################################## domainlist local_domains = dsearch;/etc/exim/domains/ domainlist relay_to_domains = dsearch;/etc/exim/domains/ hostlist relay_from_hosts = 127.0.0.1 +hostlist whitelist = net-iplsearch;/etc/exim/white-blocks.conf hostlist spammers = net-iplsearch;/etc/exim/spam-blocks.conf untrusted_set_sender = * acl_smtp_connect = acl_check_spammers @@ -45,6 +46,7 @@ DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} begin acl ########################################################################## acl_check_spammers: + accept hosts = +whitelist drop message = Your host in blacklist on this server. log_message = Host in blacklist hosts = +spammers @@ -253,7 +255,7 @@ begin transports ########################################################################## remote_smtp: driver = smtp - helo_data = $sender_address_domain + #helo_data = $sender_address_domain dkim_domain = DKIM_DOMAIN dkim_selector = mail dkim_private_key = DKIM_PRIVATE_KEY diff --git a/install/vst-install.sh b/install/vst-install.sh index 4249e91c9..60a7f8744 100644 --- a/install/vst-install.sh +++ b/install/vst-install.sh @@ -515,6 +515,7 @@ if [ "$srv_type" = 'micro' ] || [ "$srv_type" = 'small' ]; then fi wget $CHOST/$VERSION/dnsbl.conf -O /etc/exim/dnsbl.conf wget $CHOST/$VERSION/spam-blocks.conf -O /etc/exim/spam-blocks.conf +touch /etc/exim/white-blocks.conf rm -rf /etc/exim/domains mkdir -p /etc/exim/domains chmod 640 /etc/exim/exim.conf