From: Adam D. Barratt Date: Tue, 22 Oct 2019 16:49:04 +0000 (+0100) Subject: eximconf: add an explanatory comment for default options X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=inline;h=6901e51f8f300b6a61c812f6841c1e2168e3353b;hp=366bd21d6530ddbf1b9671543185f3d2cd006238;p=mirror%2Fdsa-puppet.git eximconf: add an explanatory comment for default options Signed-off-by: Adam D. Barratt --- diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 400155485..5db40f36c 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -307,6 +307,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}{}} +# Users from LDAP can decide whether to subscribe to default filtering. +# If a user has not explicitly disabled the option, the assumption is in +# favour of filtering. HAS_DEFAULT_OPTIONS = ${if and {\ {eq{${lookup{$local_part}dbmnz{/var/lib/misc/$primary_hostname/default-mail-options.db}{$value}{TRUE}}}{TRUE}}\ {exists{${extract{directory}{VDOMAINDATA}{${value}/mail-forward.db}}}}\