lists: Remove the replaced Suricata exporters

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/dnsbl/lists.py b/src/dnsbl/lists.py
index 06c9d80afd2a4163291846d75300b02f204681b8..83c625b1f41de2ce0144976febabf36e186e0699 100644 (file)
--- a/src/dnsbl/lists.py
+++ b/src/dnsbl/lists.py
@@ -497,12 +497,7 @@ class List(sqlmodel.SQLModel, database.BackendMixin, table=True):
                        "hosts"         : exporters.HostsExporter,
                        "rpz"           : exporters.RPZExporter,
                        "squidguard"    : exporters.SquidGuardExporter,
-
-                       # Suricata
-                       "suricata-dns"  : exporters.SuricataDNSExporter,
-                       "suricata-http" : exporters.SuricataHTTPExporter,
-                       "suricata-tls"  : exporters.SuricataTLSExporter,
-                       "suricata-quic" : exporters.SuricataQUICExporter,
+                       "suricata"      : exporters.SuricataExporter,
                }
 
                # Fetch the exporter

diff --git a/src/scripts/dnsbl.in b/src/scripts/dnsbl.in
index 78a5bf019a316091de9d1e611a67d9b47256e0e0..89c46708091ad3e636417701944f5900e7f2f628 100644 (file)
--- a/src/scripts/dnsbl.in
+++ b/src/scripts/dnsbl.in
@@ -111,8 +111,7 @@ class CLI(object):
                export.add_argument("output", type=argparse.FileType("wb"),
                                help=_("The output file"))
                export.add_argument("--format", default="domains",
-                               choices=("abp", "domains", "dnsbl", "hosts", "rpz", "squidguard",
-                                       "suricata-dns", "suricata-http", "suricata-tls", "suricata-quic"),
+                               choices=("abp", "domains", "dnsbl", "hosts", "rpz", "squidguard", "suricata",),
                                help=_("Output Format"))
                export.set_defaults(func=self.__export)