From: Michael Tremer Date: Sun, 11 Jan 2026 12:26:59 +0000 (+0000) Subject: Rename the whole project to "IPFire DBL" X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=dbl.git Rename the whole project to "IPFire DBL" DNS is not strictly true since we are using the domain lists in other places now, too. Therefore I prefer the more generic term. Signed-off-by: Michael Tremer --- diff --git a/.gitignore b/.gitignore index 1db8edd..dc79e29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ /Makefile /build-aux /missing -/src/scripts/dnsbl +/src/scripts/dbl /tmp /*.tar.bz2 /*.tar.gz diff --git a/Makefile.am b/Makefile.am index f125e1c..7aa7bf8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -52,49 +52,49 @@ SED_PROCESS = \ # ------------------------------------------------------------------------------ dist_pkgpython_PYTHON = \ - src/dnsbl/__init__.py \ - src/dnsbl/auth.py \ - src/dnsbl/checker.py \ - src/dnsbl/database.py \ - src/dnsbl/domains.py \ - src/dnsbl/exporters.py \ - src/dnsbl/i18n.py \ - src/dnsbl/lists.py \ - src/dnsbl/logger.py \ - src/dnsbl/reports.py \ - src/dnsbl/sources.py \ - src/dnsbl/users.py \ - src/dnsbl/util.py + src/dbl/__init__.py \ + src/dbl/auth.py \ + src/dbl/checker.py \ + src/dbl/database.py \ + src/dbl/domains.py \ + src/dbl/exporters.py \ + src/dbl/i18n.py \ + src/dbl/lists.py \ + src/dbl/logger.py \ + src/dbl/reports.py \ + src/dbl/sources.py \ + src/dbl/users.py \ + src/dbl/util.py dist_pkgpython_api_PYTHON = \ - src/dnsbl/api/__init__.py \ - src/dnsbl/api/domains.py \ - src/dnsbl/api/lists.py \ - src/dnsbl/api/middlewares.py \ - src/dnsbl/api/reports.py + src/dbl/api/__init__.py \ + src/dbl/api/domains.py \ + src/dbl/api/lists.py \ + src/dbl/api/middlewares.py \ + src/dbl/api/reports.py pkgpython_apidir = $(pkgpythondir)/api dist_systemdsystemunit_DATA = \ - src/systemd/dnsbl-api.service \ - src/systemd/dnsbl-notify.timer + src/systemd/dbl-api.service \ + src/systemd/dbl-notify.timer systemdsystemunit_DATA = \ - src/systemd/dnsbl-notify.service + src/systemd/dbl-notify.service EXTRA_DIST += \ - src/systemd/dnsbl-notify.service.in + src/systemd/dbl-notify.service.in CLEANFILES += \ - src/systemd/dnsbl-notify.service + src/systemd/dbl-notify.service # ------------------------------------------------------------------------------ CLEANFILES += \ - src/scripts/dnsbl + src/scripts/dbl EXTRA_DIST += \ - src/scripts/dnsbl.in + src/scripts/dbl.in bin_SCRIPTS = \ - src/scripts/dnsbl + src/scripts/dbl diff --git a/configure.ac b/configure.ac index d255af0..56965f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -20,11 +20,11 @@ AC_PREREQ([2.64]) -AC_INIT([dnsbl], +AC_INIT([dbl], [20251205], [info@ipfire.org], - [dnsbl], - [https://dnsbl.ipfire.org]) + [dbl], + [https://dbl.ipfire.org]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/src/dnsbl/__init__.py b/src/dbl/__init__.py similarity index 97% rename from src/dnsbl/__init__.py rename to src/dbl/__init__.py index 7554d40..79d6565 100644 --- a/src/dnsbl/__init__.py +++ b/src/dbl/__init__.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -51,7 +51,7 @@ class Backend(object): # Connect to the database self.db = self.connect() - log.debug("DNS Blocklist Backend Initialized") + log.debug("Domain Blocklist Backend Initialized") def parse_config(self, config=None): """ diff --git a/src/dnsbl/api/__init__.py b/src/dbl/api/__init__.py similarity index 95% rename from src/dnsbl/api/__init__.py rename to src/dbl/api/__init__.py index 4289cd6..c3224c1 100644 --- a/src/dnsbl/api/__init__.py +++ b/src/dbl/api/__init__.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Doomain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -29,7 +29,7 @@ from . import middlewares # Initialize the app app = fastapi.FastAPI( - title = "IPFire DNSBL API", + title = "IPFire DBL API", # Enable debug mode debug = True, @@ -38,7 +38,7 @@ app.add_middleware(middlewares.DatabaseSessionMiddleware) # Initialize the backend backend = app.state.backend = Backend( - config = "/etc/dnsbl.conf", + config = "/etc/dbl.conf", debug = True, ) diff --git a/src/dnsbl/api/domains.py b/src/dbl/api/domains.py similarity index 96% rename from src/dnsbl/api/domains.py rename to src/dbl/api/domains.py index d795a59..2861f99 100644 --- a/src/dnsbl/api/domains.py +++ b/src/dbl/api/domains.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2026 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/dnsbl/api/lists.py b/src/dbl/api/lists.py similarity index 98% rename from src/dnsbl/api/lists.py rename to src/dbl/api/lists.py index 95b3972..05f0b5f 100644 --- a/src/dnsbl/api/lists.py +++ b/src/dbl/api/lists.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/dnsbl/api/middlewares.py b/src/dbl/api/middlewares.py similarity index 96% rename from src/dnsbl/api/middlewares.py rename to src/dbl/api/middlewares.py index 534731b..6a59f66 100644 --- a/src/dnsbl/api/middlewares.py +++ b/src/dbl/api/middlewares.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2026 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/dnsbl/api/reports.py b/src/dbl/api/reports.py similarity index 97% rename from src/dnsbl/api/reports.py rename to src/dbl/api/reports.py index c928471..1327e18 100644 --- a/src/dnsbl/api/reports.py +++ b/src/dbl/api/reports.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/dnsbl/auth.py b/src/dbl/auth.py similarity index 98% rename from src/dnsbl/auth.py rename to src/dbl/auth.py index ca98227..2c0440c 100644 --- a/src/dnsbl/auth.py +++ b/src/dbl/auth.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/dnsbl/checker.py b/src/dbl/checker.py similarity index 98% rename from src/dnsbl/checker.py rename to src/dbl/checker.py index 1bd1aaa..5e80801 100644 --- a/src/dnsbl/checker.py +++ b/src/dbl/checker.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/dnsbl/database.py b/src/dbl/database.py similarity index 98% rename from src/dnsbl/database.py rename to src/dbl/database.py index 2b165d5..edeeb83 100644 --- a/src/dnsbl/database.py +++ b/src/dbl/database.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/dnsbl/domains.py b/src/dbl/domains.py similarity index 98% rename from src/dnsbl/domains.py rename to src/dbl/domains.py index efdbfb9..3f29ca2 100644 --- a/src/dnsbl/domains.py +++ b/src/dbl/domains.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/dnsbl/exporters.py b/src/dbl/exporters.py similarity index 94% rename from src/dnsbl/exporters.py rename to src/dbl/exporters.py index 26fbe46..da552a5 100644 --- a/src/dnsbl/exporters.py +++ b/src/dbl/exporters.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -130,10 +130,10 @@ class TextExporter(Exporter): lines = [ "##############################################################################", - " DNS Blocklist for IPFire", + " Domain Blocklist for IPFire", "##############################################################################", "", - " This file contains domains that are part of the official IPFire DNS", + " This file contains domains that are part of the official IPFire Domain", " Blocklist Project. It is intended for use with DNS servers and firewalls", " that support blocklisting of known malicious or unwanted domains.", "", @@ -156,7 +156,7 @@ class TextExporter(Exporter): " Copyright (C) %s - IPFire Team" % now.strftime("%Y"), "", " For more information or to contribute:", - " https://dnsbl.ipfire.org/", + " https://dbl.ipfire.org/", "", "##############################################################################", "", @@ -364,14 +364,14 @@ class ZoneExporter(TextExporter): class BlocklistExporter(ZoneExporter): """ - Exports the list as a regular DNSBL zone file + Exports the list as a regular DBL zone file """ - prefix = "dnsbl" + prefix = "dbl" type = "A" content = "127.0.0.2" # The section in the configuration file for additional settings - section = "dnsbl" + section = "dbl" class RPZExporter(ZoneExporter): @@ -443,7 +443,7 @@ class SuricataRulesExporter(TextExporter): rules = { # DNS "dns" : { - "msg" : "\"IPFire DNSBL [%s] Blocked DNS Query\"" % self.list, + "msg" : "\"IPFire DBL [%s] Blocked DNS Query\"" % self.list, "dns.query" : None, "domain" : None, "dataset" : ( @@ -458,16 +458,16 @@ class SuricataRulesExporter(TextExporter): "rev" : "1", "reference" : ( "url", - "https://www.ipfire.org/dnsbl/%s" % self.list.slug, + "https://www.ipfire.org/dbl/%s" % self.list.slug, ), "metadata" : { - "dnsbl" : "%s.dnsbl.ipfire.org" % self.list.slug, + "dbl" : "%s.dbl.ipfire.org" % self.list.slug, }, }, # HTTP "http" : { - "msg" : "\"IPFire DNSBL [%s] Blocked HTTP Request\"" % self.list, + "msg" : "\"IPFire DBL [%s] Blocked HTTP Request\"" % self.list, "http.host" : None, "domain" : None, "dataset" : ( @@ -482,16 +482,16 @@ class SuricataRulesExporter(TextExporter): "rev" : "1", "reference" : ( "url", - "https://www.ipfire.org/dnsbl/%s" % self.list.slug, + "https://www.ipfire.org/dbl/%s" % self.list.slug, ), "metadata" : { - "dnsbl" : "%s.dnsbl.ipfire.org" % self.list.slug, + "dbl" : "%s.dbl.ipfire.org" % self.list.slug, }, }, # TLS "tls" : { - "msg" : "\"IPFire DNSBL [%s] Blocked TLS Connection\"" % self.list, + "msg" : "\"IPFire DBL [%s] Blocked TLS Connection\"" % self.list, "tls.sni" : None, "domain" : None, "dataset" : ( @@ -506,16 +506,16 @@ class SuricataRulesExporter(TextExporter): "rev" : "1", "reference" : ( "url", - "https://www.ipfire.org/dnsbl/%s" % self.list.slug, + "https://www.ipfire.org/dbl/%s" % self.list.slug, ), "metadata" : { - "dnsbl" : "%s.dnsbl.ipfire.org" % self.list.slug, + "dbl" : "%s.dbl.ipfire.org" % self.list.slug, }, }, # QUIC "quic" : { - "msg" : "\"IPFire DNSBL [%s] Blocked QUIC Connection\"" % self.list, + "msg" : "\"IPFire DBL [%s] Blocked QUIC Connection\"" % self.list, "quic.sni" : None, "domain" : None, "dataset" : ( @@ -530,10 +530,10 @@ class SuricataRulesExporter(TextExporter): "rev" : "1", "reference" : ( "url", - "https://www.ipfire.org/dnsbl/%s" % self.list.slug, + "https://www.ipfire.org/dbl/%s" % self.list.slug, ), "metadata" : { - "dnsbl" : "%s.dnsbl.ipfire.org" % self.list.slug, + "dbl" : "%s.dbl.ipfire.org" % self.list.slug, }, }, } @@ -645,7 +645,7 @@ class CombinedSuricataExporter(MultiExporter): class DirectoryExporter(MultiExporter): """ This is a simple nested exporter that will create the directory structure - as it is available on https://dnsbl.ipfire.org/lists. + as it is available on https://dbl.ipfire.org/lists. """ files = { # Simple formats @@ -653,7 +653,7 @@ class DirectoryExporter(MultiExporter): "%(list)s/hosts.txt" : HostsExporter, # DNS Zones - "%(list)s/dnsbl.zone" : BlocklistExporter, + "%(list)s/dbl.zone" : BlocklistExporter, "%(list)s/rpz.zone" : RPZExporter, # Adblock Plus diff --git a/src/dnsbl/i18n.py b/src/dbl/i18n.py similarity index 90% rename from src/dnsbl/i18n.py rename to src/dbl/i18n.py index 73f83f8..38c389f 100644 --- a/src/dnsbl/i18n.py +++ b/src/dbl/i18n.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -22,6 +22,6 @@ import gettext def _(singular, plural=None, n=None): if plural: - return gettext.dngettext("dnsbl", singular, plural, n) + return gettext.dngettext("dbl", singular, plural, n) - return gettext.dgettext("dnsbl", singular) + return gettext.dgettext("dbl", singular) diff --git a/src/dnsbl/lists.py b/src/dbl/lists.py similarity index 99% rename from src/dnsbl/lists.py rename to src/dbl/lists.py index 7e57493..23b8f33 100644 --- a/src/dnsbl/lists.py +++ b/src/dbl/lists.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -536,7 +536,7 @@ class List(sqlmodel.SQLModel, database.BackendMixin, table=True): formats = { "abp" : exporters.AdBlockPlusExporter, "domains" : exporters.DomainsExporter, - "dnsbl" : exporters.BlocklistExporter, + "dbl" : exporters.BlocklistExporter, "hosts" : exporters.HostsExporter, "rpz" : exporters.RPZExporter, "squidguard" : exporters.SquidGuardExporter, diff --git a/src/dnsbl/logger.py b/src/dbl/logger.py similarity index 95% rename from src/dnsbl/logger.py rename to src/dbl/logger.py index 70ea35f..d66d18e 100644 --- a/src/dnsbl/logger.py +++ b/src/dbl/logger.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -22,7 +22,7 @@ import logging import logging.handlers # Initialise root logger -log = logging.getLogger("dnsbl") +log = logging.getLogger("dbl") log.setLevel(logging.INFO) # Log to console diff --git a/src/dnsbl/reports.py b/src/dbl/reports.py similarity index 94% rename from src/dnsbl/reports.py rename to src/dbl/reports.py index bb0bb55..1128c0e 100644 --- a/src/dnsbl/reports.py +++ b/src/dbl/reports.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -158,7 +158,7 @@ class Reports(object): # Send the message moderator.sendmail("\n".join(lines), headers={ - "Subject" : _("[IPFire DNSBL] Pending Reports"), + "Subject" : _("[IPFire DBL] Pending Reports"), # Mark that this email is auto-generated "Auto-Submitted" : "auto-generated", @@ -291,7 +291,7 @@ class Report(sqlmodel.SQLModel, database.BackendMixin, table=True): lines = ( _("Hello,"), "", - _("Thank you for submitting a report to the IPFire DNSBL service."), + _("Thank you for submitting a report to the IPFire DBL service."), "", _("We have received your report regarding %s and wanted to confirm that it's now in our moderation queue.") % self.name, "", @@ -302,12 +302,12 @@ class Report(sqlmodel.SQLModel, database.BackendMixin, table=True): " Reports like yours are essential to maintaining the effectiveness of our service."), "", _("Best regards,"), - "-%s" % _("DNSBL Moderation Team"), + "-%s" % _("DBL Moderation Team"), ) # Send the email reporter.sendmail("\n".join(lines), headers={ - "Subject" : _("Your DNSBL Report Has Been Received"), + "Subject" : _("Your DBL Report Has Been Received"), }) def _send_closing_notification(self): @@ -330,12 +330,12 @@ class Report(sqlmodel.SQLModel, database.BackendMixin, table=True): # ACCEPTED if self.accepted: - subject = "[IPFire DNSBL] %s" % (_("Your report for %s has been accepted") % self.name) + subject = "[IPFire DBL] %s" % (_("Your report for %s has been accepted") % self.name) lines = ( _("Hello,"), "", - _("Thank you for taking the time to report %s to our IPFire DNSBL service.") % self.name, + _("Thank you for taking the time to report %s to our IPFire DBL service.") % self.name, "", _("We've reviewed your submission and are pleased to inform you that your report has been ACCEPTED." " The domain has been added to our blocklist and will now be flagged by systems using our service."), @@ -351,12 +351,12 @@ class Report(sqlmodel.SQLModel, database.BackendMixin, table=True): # DECLINED else: - subject = "[IPFire DNSBL] %s" % (_("Your report for %s has been reviewed") % self.name) + subject = "[IPFire DBL] %s" % (_("Your report for %s has been reviewed") % self.name) lines = ( _("Hello,"), "", - _("Thank you for taking the time to report %s to our IPFire DNSBL service.") % self.name, + _("Thank you for taking the time to report %s to our IPFire DBL service.") % self.name, "", _("We've carefully reviewed your submission." " After investigation, we've determined that this domain does not meet our criteria" @@ -384,4 +384,4 @@ class Report(sqlmodel.SQLModel, database.BackendMixin, table=True): @property def url(self): - return "https://www.ipfire.org/dnsbl/reports/%s" % self.id + return "https://www.ipfire.org/dbl/reports/%s" % self.id diff --git a/src/dnsbl/sources.py b/src/dbl/sources.py similarity index 99% rename from src/dnsbl/sources.py rename to src/dbl/sources.py index 72101bb..94be2d0 100644 --- a/src/dnsbl/sources.py +++ b/src/dbl/sources.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/dnsbl/users.py b/src/dbl/users.py similarity index 96% rename from src/dnsbl/users.py rename to src/dbl/users.py index f714fbe..9da85e7 100644 --- a/src/dnsbl/users.py +++ b/src/dbl/users.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2026 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -112,13 +112,13 @@ class Users(object): @property def admins(self): - return self.get_group("dnsbl-admins") + return self.get_group("dbl-admins") # Moderators @property def moderators(self): - return self.get_group("dnsbl-moderators") + return self.get_group("dbl-moderators") class LDAPObject(object): @@ -177,7 +177,7 @@ class User(LDAPObject): message.set_content(content) # no-reply@ipfire.org - no_reply = email.utils.formataddr(("IPFire DNSBL", "no-reply@ipfire.org")) + no_reply = email.utils.formataddr(("IPFire DBL", "no-reply@ipfire.org")) # Set the recipient message["To"] = email.utils.formataddr((self.cn, self.mail)) diff --git a/src/dnsbl/util.py b/src/dbl/util.py similarity index 98% rename from src/dnsbl/util.py rename to src/dbl/util.py index 327cb76..8f2b082 100644 --- a/src/dnsbl/util.py +++ b/src/dbl/util.py @@ -1,6 +1,6 @@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # diff --git a/src/scripts/dnsbl.in b/src/scripts/dbl.in similarity index 96% rename from src/scripts/dnsbl.in rename to src/scripts/dbl.in index 28fe050..1e32833 100644 --- a/src/scripts/dnsbl.in +++ b/src/scripts/dbl.in @@ -1,7 +1,7 @@ #!@PYTHON@ ############################################################################### # # -# dnsbl - A DNS Blocklist Compositor For IPFire # +# dbl - A Domain Blocklist Compositor For IPFire # # Copyright (C) 2025 IPFire Development Team # # # # This program is free software: you can redistribute it and/or modify # @@ -22,10 +22,10 @@ import argparse import babel.dates import babel.numbers -import dnsbl -import dnsbl.checker -import dnsbl.exporters -import dnsbl.util +import dbl +import dbl.checker +import dbl.exporters +import dbl.util import logging import os import rich.console @@ -35,7 +35,7 @@ import sys import uuid # i18n -from dnsbl.i18n import _ +from dbl.i18n import _ class CLI(object): def __init__(self): @@ -52,7 +52,7 @@ class CLI(object): subparsers = parser.add_subparsers() # Global Configuration Flags - parser.add_argument("--config", default="@sysconfdir@/dnsbl.conf", + parser.add_argument("--config", default="@sysconfdir@/dbl.conf", type=argparse.FileType("r"), help=_("Configuration File")) # Logging Flags @@ -79,7 +79,7 @@ class CLI(object): help=_("The license of the list")) create.add_argument("--description", help=_("The description of the list")) - create.add_argument("--priority", choices=dnsbl.lists.PRIORITIES, + create.add_argument("--priority", choices=dbl.lists.PRIORITIES, help=_("The priority of this list"), default="INFORMATIONAL") create.set_defaults(func=self.__create) @@ -112,7 +112,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",), + choices=("abp", "domains", "dbl", "hosts", "rpz", "squidguard", "suricata",), help=_("Output Format")) export.set_defaults(func=self.__export) @@ -228,12 +228,12 @@ class CLI(object): # Configure logging if args.debug: - dnsbl.logger.set_level(logging.DEBUG) + dbl.logger.set_level(logging.DEBUG) elif args.quiet: - dnsbl.logger.set_level(logging.ERROR) + dbl.logger.set_level(logging.ERROR) # Initialize the backend - backend = dnsbl.Backend( + backend = dbl.Backend( config = args.config, debug = args.debug, ) @@ -397,7 +397,7 @@ class CLI(object): Exports all lists """ # Launch the DirectoryExporter - exporter = dnsbl.exporters.DirectoryExporter(backend, root=args.directory) + exporter = dbl.exporters.DirectoryExporter(backend, root=args.directory) exporter() def __add_source(self, backend, args): @@ -526,7 +526,7 @@ class CLI(object): # Fetch the list list = self.__get_list(backend, args.list) - with dnsbl.util.Stopwatch(_("Optimizing %s") % list): + with dbl.util.Stopwatch(_("Optimizing %s") % list): list.optimize() def __history(self, backend, args): @@ -564,7 +564,7 @@ class CLI(object): """ Runs the checker over all domains """ - checker = dnsbl.checker.Checker(backend) + checker = dbl.checker.Checker(backend) checker.check(*args.domain) # Authentication diff --git a/src/systemd/.gitignore b/src/systemd/.gitignore index 0d1a9c7..62adff2 100644 --- a/src/systemd/.gitignore +++ b/src/systemd/.gitignore @@ -1 +1 @@ -/dnsbl-notify.service +/dbl-notify.service diff --git a/src/systemd/dnsbl-api.service b/src/systemd/dbl-api.service similarity index 66% rename from src/systemd/dnsbl-api.service rename to src/systemd/dbl-api.service index 04fe5b4..9dcc01f 100644 --- a/src/systemd/dnsbl-api.service +++ b/src/systemd/dbl-api.service @@ -1,10 +1,10 @@ [Unit] -Description=IPFire DNSBL API +Description=IPFire DBL API After=network.target postgresql.service Requires=postgresql.service [Service] -ExecStart=/usr/bin/uvicorn dnsbl.api:app +ExecStart=/usr/bin/uvicorn dbl.api:app User=nobody [Install] diff --git a/src/systemd/dnsbl-notify.service.in b/src/systemd/dbl-notify.service.in similarity index 50% rename from src/systemd/dnsbl-notify.service.in rename to src/systemd/dbl-notify.service.in index 4aea08b..a37cf9f 100644 --- a/src/systemd/dnsbl-notify.service.in +++ b/src/systemd/dbl-notify.service.in @@ -1,9 +1,9 @@ [Unit] -Description=IPFire DNSBL Notification +Description=IPFire DBL Notification [Service] Type=oneshot -ExecStart=@bindir@/dnsbl --quiet notify +ExecStart=@bindir@/dbl --quiet notify User=nobody [Install] diff --git a/src/systemd/dnsbl-notify.timer b/src/systemd/dbl-notify.timer similarity index 86% rename from src/systemd/dnsbl-notify.timer rename to src/systemd/dbl-notify.timer index 99df620..b1c0fc2 100644 --- a/src/systemd/dnsbl-notify.timer +++ b/src/systemd/dbl-notify.timer @@ -1,5 +1,5 @@ [Unit] -Description=IPFire DNSBL Notification Timer +Description=IPFire DBL Notification Timer [Timer] # Run at 9:00 AM diff --git a/tools/dump-database-schema.sh b/tools/dump-database-schema.sh index fc0ab62..762720e 100755 --- a/tools/dump-database-schema.sh +++ b/tools/dump-database-schema.sh @@ -1,4 +1,4 @@ #!/bin/bash -pg_dump --schema-only --no-owner -h dnsbl01.haj.ipfire.org -U dnsbl dnsbl \ +pg_dump --schema-only --no-owner -h dbl01.haj.ipfire.org -U dbl dbl \ > src/database.sql