Fix freemail/disposable multimap definitions

diff --git a/conf/modules.d/multimap.conf b/conf/modules.d/multimap.conf
index 04f581883c49d692b8b59425c7594902b2499209..bc8801604a3dc9db38b3c6deb1ec88cbc7c4c835 100644 (file)
--- a/conf/modules.d/multimap.conf
+++ b/conf/modules.d/multimap.conf
@@ -17,6 +17,126 @@ multimap {
     .include(try=true,priority=5) "${DBDIR}/dynamic/multimap.conf"
     .include(try=true,priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/multimap.conf"
     .include(try=true,priority=10) "$LOCAL_CONFDIR/override.d/multimap.conf"
+
+    # Freemail Addresses
+
+    freemail_envfrom {
+        type = "from";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/free.txt.zst";
+        symbol = "FREEMAIL_ENVFROM";
+        description = "Envelope From is a Freemail address";
+        score = 0.0;
+    }
+
+    freemail_envrcpt {
+        type = "rcpt";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/free.txt.zst";
+        symbol = "FREEMAIL_ENVRCPT";
+        description = "Envelope Recipient is a Freemail address";
+        score = 0.0;
+    }
+
+    freemail_from {
+        type = "header";
+        header = "from";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/free.txt.zst";
+        symbol = "FREEMAIL_FROM";
+        description = "From is a Freemail address";
+        score = 0.0;
+    }
+
+    freemail_to {
+        type = "header";
+        header = "To";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/free.txt.zst";
+        symbol = "FREEMAIL_TO";
+        description = "To is a Freemail address";
+        score = 0.0;
+    }
+
+    freemail_cc {
+        type = "header";
+        header = "Cc";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/free.txt.zst";
+        symbol = "FREEMAIL_CC";
+        description = "To is a Freemail address";
+        score = 0.0;
+    }
+
+    freemail_replyto {
+        type = "header";
+        header = "Reply-To";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/free.txt.zst";
+        symbol = "FREEMAIL_REPLYTO";
+        description = "Reply-To is a Freemail address";
+        score = 0.0;
+    }
+
+    # Disposable Addresses
+
+    disposable_envfrom {
+        type = "from";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/disposable.txt.zst";
+        symbol = "DISPOSABLE_ENVFROM";
+        description = "Envelope From is a Disposable e-mail address";
+        score = 0.0;
+    }
+
+    disposable_envrcpt {
+        type = "rcpt";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/disposable.txt.zst";
+        symbol = "DISPOSABLE_ENVRCPT";
+        description = "Envelope Recipient is a Disposable e-mail address";
+        score = 0.0;
+    }
+
+    disposable_from {
+        type = "header";
+        header = "from";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/disposable.txt.zst";
+        symbol = "DISPOSABLE_FROM";
+        description = "From a Disposable e-mail address";
+        score = 0.0;
+    }
+
+    disposable_to {
+        type = "header";
+        header = "To";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/disposable.txt.zst";
+        symbol = "DISPOSABLE_TO";
+        description = "To a disposable e-mail address";
+        score = 0.0;
+    }
+
+    disposable_cc {
+        type = "header";
+        header = "Cc";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/disposable.txt.zst";
+        symbol = "DISPOSABLE_CC";
+        description = "To a disposable e-mail address";
+        score = 0.0;
+    }
+
+    disposable_replyto {
+        type = "header";
+        header = "Reply-To";
+        filter = "email:domain";
+        map = "https://rspamd.com/freemail/disposable.txt.zst";
+        symbol = "DISPOSABLE_REPLYTO";
+        description = "Reply-To a disposable e-mail address";
+        score = 0.0;
+    }
 }
 
 /* Example setup
@@ -48,122 +168,3 @@ url_tld_re {
 }
 */
 
-# Freemail Addresses
-
-freemail_envfrom {
-    type = "from";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/free.txt.zst";
-    symbol = "FREEMAIL_ENVFROM";
-    description = "Envelope From is a Freemail address";
-    score = 0.0;
-}
-
-freemail_envrcpt {
-    type = "rcpt";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/free.txt.zst";
-    symbol = "FREEMAIL_ENVRCPT";
-    description = "Envelope Recipient is a Freemail address";
-    score = 0.0;
-}
-
-freemail_from {
-    type = "header";
-    header = "from";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/free.txt.zst";
-    symbol = "FREEMAIL_FROM";
-    description = "From is a Freemail address";
-    score = 0.0;
-}
-
-freemail_to {
-    type = "header";
-    header = "To";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/free.txt.zst";
-    symbol = "FREEMAIL_TO";
-    description = "To is a Freemail address";
-    score = 0.0;
-}
-
-freemail_cc {
-    type = "header";
-    header = "Cc";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/free.txt.zst";
-    symbol = "FREEMAIL_CC";
-    description = "To is a Freemail address";
-    score = 0.0;
-}
-
-freemail_replyto {
-    type = "header";
-    header = "Reply-To";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/free.txt.zst";
-    symbol = "FREEMAIL_REPLYTO";
-    description = "Reply-To is a Freemail address";
-    score = 0.0;
-}
-
-# Disposable Addresses
-
-disposable_envfrom {
-    type = "from";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/disposable.txt.zst";
-    symbol = "DISPOSABLE_ENVFROM";
-    description = "Envelope From is a Disposable e-mail address";
-    score = 0.0;
-}
-
-disposable_envrcpt {
-    type = "rcpt";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/disposable.txt.zst";
-    symbol = "DISPOSABLE_ENVRCPT";
-    description = "Envelope Recipient is a Disposable e-mail address";
-    score = 0.0;
-}
-
-disposable_from {
-    type = "header";
-    header = "from";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/disposable.txt.zst";
-    symbol = "DISPOSABLE_FROM";
-    description = "From a Disposable e-mail address";
-    score = 0.0;
-}
-
-disposable_to {
-    type = "header";
-    header = "To";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/disposable.txt.zst";
-    symbol = "DISPOSABLE_TO";
-    description = "To a disposable e-mail address";
-    score = 0.0;
-}
-
-disposable_cc {
-    type = "header";
-    header = "Cc";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/disposable.txt.zst";
-    symbol = "DISPOSABLE_CC";
-    description = "To a disposable e-mail address";
-    score = 0.0;
-}
-
-disposable_replyto {
-    type = "header";
-    header = "Reply-To";
-    filter = "email:domain";
-    map = "https://rspamd.com/freemail/disposable.txt.zst";
-    symbol = "DISPOSABLE_REPLYTO";
-    description = "Reply-To a disposable e-mail address";
-    score = 0.0;
-}