aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2016-09-19 21:42:13 +0100
committerGitHub <noreply@github.com>2016-09-19 21:42:13 +0100
commita8bce892fe0f55a4917c54e2ee8a3c28d58a9488 (patch)
treebd0b58c5788539c8bc89f2640149a9d50b4065fe /conf
parentfb7085682956f3f9f347f1192401eb4c26ebeea2 (diff)
parentb0e378af1d574d2745e676acdb2cf180a7338886 (diff)
downloadrspamd-a8bce892fe0f55a4917c54e2ee8a3c28d58a9488.tar.gz
rspamd-a8bce892fe0f55a4917c54e2ee8a3c28d58a9488.zip
Merge pull request #936 from fatalbanana/dkim
[Feature] Add R_DKIM_PERMFAIL symbol
Diffstat (limited to 'conf')
-rw-r--r--conf/composites.conf5
-rw-r--r--conf/metrics.conf1
2 files changed, 6 insertions, 0 deletions
diff --git a/conf/composites.conf b/conf/composites.conf
index b64201494..40b495918 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -47,6 +47,11 @@ composite "AUTH_NA" {
score = 1.0;
policy = "remove_weight";
}
+composite {
+ name = "DKIM_MIXED";
+ expression = "-R_DKIM_ALLOW & (R_DKIM_DNSFAIL | R_DKIM_PERMFAIL | R_DKIM_REJECT)"
+ policy = "remove_weight";
+}
.include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/composites.conf"
.include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/composites.conf"
diff --git a/conf/metrics.conf b/conf/metrics.conf
index 7ece1c542..8d228a5ba 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -327,6 +327,7 @@ metric {
symbol "R_DKIM_REJECT" {
weight = 1.0;
description = "DKIM verification failed";
+ one_shot = true;
}
symbol "R_DKIM_TEMPFAIL" {
weight = 0.0;