[Conf] Modernize composites config

diff --git a/conf/composites.conf b/conf/composites.conf
index b3372a997cee231174429766b8485197d914132e..5125de45cb8e3724402fd3c1f95d396caf0dd2bd 100644 (file)
--- 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";
 }