summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-07-04 18:23:34 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:52:28 +0200
commitba2675933034529983123f55b32d0430ba0da281 (patch)
treebb4cb42969cfc90677bc44f99c4ea324704362a0
parent252bc20ce5b161e20724e2f21ccb13bba3b7ed58 (diff)
wibble
-rw-r--r--roles/amavis/templates/etc/amavis/conf.d/50-user.j214
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2 b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
index f5a8c61..200ce90 100644
--- a/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
+++ b/roles/amavis/templates/etc/amavis/conf.d/50-user.j2
@@ -33,7 +33,7 @@ undef $enable_dkim_signing;
$enable_dkim_signing = 1;
# Sign *all* outgoing mails with *our* key (yes, amavis complains, but this is
# safe as we force our domain with the 'd' tag).
-dkim_key(qr'^', '20140703', '/var/lib/dkim/20140703.'.$mydomain.'.key');
+dkim_key(qr/./, '20140703', '/var/lib/dkim/20140703.'.$mydomain.'.key');
@dkim_signature_options_bysender_maps = (
{ '.' => { d => $mydomain
, a => 'rsa-sha256'
@@ -63,10 +63,10 @@ $signed_header_fields{received} = 0;
# A couple of common banned rules one might can refer by their name
%banned_rules = (
- 'NO-MS-EXEC'=> new_RE( qr'^\.exe-ms$' ),
- 'PASSALL' => new_RE( [qr'^' => 0] ),
- 'ALLOW_EXE' => new_RE( qr'.\.(vbs|pif|scr|bat)$'i, [qr'^\.exe$' => 0] ),
- 'ALLOW_VBS' => new_RE( [qr'.\.vbs$' => 0] ),
+ 'NO-MS-EXEC'=> new_RE( qr/^\.exe-ms$/ ),
+ 'PASSALL' => new_RE( [qr/^/ => 0] ),
+ 'ALLOW_EXE' => new_RE( qr/.\.(vbs|pif|scr|bat)$/i, [qr/^\.exe$/ => 0] ),
+ 'ALLOW_VBS' => new_RE( [qr/.\.vbs$/ => 0] ),
);
@@ -148,7 +148,7 @@ $policy_bank{'OUTGOING'} = {
bypass_header_checks_maps => 1,
bypass_spam_checks_maps => 1,
- # If found, notify postmaster, quarantine and discard
+ # If found, notify postmaster, quarantine, then discard
quarantine_to_maps_by_ccat => { CC_VIRUS, [$virus_quarantine_to], CC_CATCHALL, undef },
quarantine_method_by_ccat => { CC_VIRUS, [$virus_quarantine_method], CC_CATCHALL, undef },
admin_maps_by_ccat => { CC_VIRUS, ["postmaster\@$mydomain"], CC_CATCHALL, undef },
@@ -165,7 +165,7 @@ $policy_bank{'INCOMING'} = {
message_size_limit_maps => [],
# Per-recipient Bayes Database
- sa_username_maps => [ new_RE ( [ qr'^(.+@.+)$'i => '$1' ] )
+ sa_username_maps => [ new_RE ( [ qr/^(.+\@.+)$/ => '$1' ] )
, 'amavis' # catch-all
],