Lookup store refactoring

resources/config/smtp/spamfilter.toml

@@ -2,58 +2,64 @@
 # SMTP Spam & Phishing filter configuration
 #############################################
 
-[store."spam"]
+[store."spam/free-domains"]
 type = "memory"
-
-[store."spam".lookup."free-domains"]
-type = "glob"
+format = "glob"
 comment = '#'
 values = ["https://get.stalw.art/resources/config/spamfilter/maps/domains_free.list", 
           "file+fallback://%{BASE_PATH}%/etc/spamfilter/maps/domains_free.list"]
 
-[store."spam".lookup."disposable-domains"]
-type = "glob"
+[store."spam/disposable-domains"]
+type = "memory"
+format = "glob"
 comment = '#'
 values = ["https://get.stalw.art/resources/config/spamfilter/maps/domains_disposable.list", 
           "file+fallback://%{BASE_PATH}%/etc/spamfilter/maps/domains_disposable.list"]
 
-[store."spam".lookup."redirectors"]
-type = "glob"
+[store."spam/redirectors"]
+type = "memory"
+format = "glob"
 comment = '#'
 values = ["https://get.stalw.art/resources/config/spamfilter/maps/url_redirectors.list", 
           "file+fallback://%{BASE_PATH}%/etc/spamfilter/maps/url_redirectors.list"]
 
-[store."spam".lookup."domains-allow"]
-type = "glob"
+[store."spam/domains-allow"]
+type = "memory"
+format = "glob"
 comment = '#'
 values = ["https://get.stalw.art/resources/config/spamfilter/maps/allow_domains.list", 
           "file+fallback://%{BASE_PATH}%/etc/spamfilter/maps/allow_domains.list"]
 
-[store."spam".lookup."dmarc-allow"]
-type = "glob"
+[store."spam/dmarc-allow"]
+type = "memory"
+format = "glob"
 comment = '#'
 values = ["https://get.stalw.art/resources/config/spamfilter/maps/allow_dmarc.list", 
           "file+fallback://%{BASE_PATH}%/etc/spamfilter/maps/allow_dmarc.list"]
 
-[store."spam".lookup."spf-dkim-allow"]
-type = "glob"
+[store."spam/spf-dkim-allow"]
+type = "memory"
+format = "glob"
 comment = '#'
 values = ["https://get.stalw.art/resources/config/spamfilter/maps/allow_spf_dkim.list", 
           "file+fallback://%{BASE_PATH}%/etc/spamfilter/maps/allow_spf_dkim.list"]
 
-[store."spam".lookup."mime-types"]
-type = "map"
+[store."spam/mime-types"]
+type = "memory"
+format = "map"
 comment = '#'
 values = ["https://get.stalw.art/resources/config/spamfilter/maps/mime_types.map", 
           "file+fallback://%{BASE_PATH}%/etc/spamfilter/maps/mime_types.map"]
 
-[store."spam".lookup."trap-address"]
-type = "glob"
+[store."spam/trap-address"]
+type = "memory"
+format = "glob"
 comment = '#'
 values = "file://%{BASE_PATH}%/etc/spamfilter/maps/spam_trap.list"
 
-[store."spam".lookup."scores"]
-type = "map"
+[store."spam/scores"]
+type = "memory"
+format = "map"
 values = "file://%{BASE_PATH}%/etc/spamfilter/maps/scores.map"
 
 [sieve.trusted.scripts]

resources/config/store/mysql.toml

@@ -14,7 +14,7 @@ disable = true
 [store."mysql".timeout]
 wait = "15s"
 
-#[store."postgresql".pool]
+#[store."mysql".pool]
 #max-connections = 10
 #min-connections = 5