From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 28 Jun 2016 10:46:02 +0000 (+0100)
Subject: [Conf] Modernize composites config
X-Git-Tag: 1.3.0~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77a167846ee380a629abf77037b7f428f22a4e68;p=thirdparty%2Frspamd.git

[Conf] Modernize composites config
---

diff --git a/conf/composites.conf b/conf/composites.conf
index b3372a997c..5125de45cb 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -14,28 +14,22 @@
 #
 # See https://rspamd.com/doc/tutorials/writing_rules.html for details
 
-composite {
-    name = "FORGED_RECIPIENTS_MAILLIST";
+composite "FORGED_RECIPIENTS_MAILLIST" {
     expression = "FORGED_RECIPIENTS & -MAILLIST";
 }
-composite {
-    name = "FORGED_SENDER_MAILLIST";
+composite "FORGED_SENDER_MAILLIST" {
     expression = "FORGED_SENDER & -MAILLIST";
 }
-composite {
-    name = "FORGED_SENDER_FORWARDING";
+composite "FORGED_SENDER_FORWARDING" {
     expression = "FORGED_SENDER & g:forwarding";
 }
-composite {
-    name = "FORGED_SENDER_VERP_SRS";
+composite "FORGED_SENDER_VERP_SRS" {
     expression = "FORGED_SENDER & (ENVFROM_PRVS | ENVFROM_VERP)";
 }
-composite {
-    name = "FORGED_MUA_MAILLIST";
+composite "FORGED_MUA_MAILLIST" {
     expression = "g:mua and -MAILLIST";
 }
-composite {
-    name = "RBL_SPAMHAUS_XBL_ANY";
+composite "RBL_SPAMHAUS_XBL_ANY" {
     expression = "(-RBL_SPAMHAUS_XBL | -RBL_SPAMHAUS_XBL1 | -RBL_SPAMHAUS_XBL2 | -RBL_SPAMHAUS_XBL3) & RECEIVED_SPAMHAUS_XBL";
 }