X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;fp=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=b2732623df6ab0f6d616bd95055577d5145a5d53;hb=76ca91bce24ecbcbcc4e62a37aa06fd0fb9f96c7;hp=9b141efdc31b2c6c33c6bcd031f832ffe0b1db37;hpb=46cee04ab06b23ab6e9e4baba655cf470d10cfc4;p=mirror%2Fdsa-puppet.git diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 9b141efdc..b2732623d 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -267,7 +267,9 @@ GREYLIST_LOCAL_PARTS = ${if match_domain{$domain}{+virtual_domains}\ {${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/grey_users}}}{$local_part}{}}}{}}}\ {${lookup{$local_part}lsearch{/etc/exim4/grey_users}{$local_part}{}}}} : \ ${lookup{$local_part}lsearch{/var/lib/misc/$primary_hostname/mail-greylist}{$local_part}{}} +<%- if @is_rtmaster -%> RT_QUEUE_MAP = /srv/rt.debian.org/mail/rt_queue_map +<%- end -%> keep_environment = add_environment = @@ -623,12 +625,6 @@ check_recipient: deny domains = !+handled_domains local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ -# forwards mail to @d.o address, even if it's a bounce from master, no reply -# from source address; rejecting all mail now. - deny recipients = mendoza@debian.org - hosts = 65.110.39.147 : 64.39.31.15 - message = cannot forward here while mailer-daemon mail is not caught - deny condition = ${lookup{$sender_address_local_part}lsearch{/etc/exim4/localusers}{true}} sender_domains= +local_domains hosts = !+debianhosts @@ -1039,7 +1035,6 @@ begin rewrite *@debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T *@people.debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T #*@${primary_hostname} "${if exists{/etc/exim4/email-addresses}{${lookup{$1}lsearch{/etc/exim4/email-addresses}{$value}fail}}fail}" fFs -m68k@buildd.debian.org m68k-build@nocrew.org Ttrbc #!!#######################################################!!#