From 296f09e07f7e2895bc4dc7f859476781e7f4b9ae Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 11 Jan 2026 12:42:40 +0000 Subject: [PATCH] dbl: Rename the DNS Blocklist Project to "IPFire DBL" Signed-off-by: Michael Tremer --- Makefile.am | 44 +++++++++---------- src/backend/base.py | 6 +-- src/backend/{dnsbl.py => dbl.py} | 20 ++++----- src/templates/base.html | 24 +++++----- src/templates/{dnsbl => dbl}/index.html | 8 ++-- .../{dnsbl => dbl}/lists/domain.html | 16 +++---- .../{dnsbl => dbl}/lists/history.html | 20 ++++----- src/templates/{dnsbl => dbl}/lists/index.html | 10 ++--- .../{dnsbl => dbl}/lists/reports.html | 16 +++---- src/templates/{dnsbl => dbl}/lists/show.html | 30 ++++++------- .../{dnsbl => dbl}/lists/sources.html | 12 ++--- .../{dnsbl => dbl}/modules/lists.html | 2 +- .../{dnsbl => dbl}/reports/show.html | 12 ++--- .../{dnsbl => dbl}/reports/submit.html | 10 ++--- .../{dnsbl => dbl}/reports/submitted.html | 2 +- src/templates/{dnsbl => dbl}/search.html | 6 +-- src/templates/static/sitemap.html | 6 +-- src/web/__init__.py | 34 +++++++------- src/web/{dnsbl.py => dbl.py} | 42 +++++++++--------- 19 files changed, 160 insertions(+), 160 deletions(-) rename src/backend/{dnsbl.py => dbl.py} (92%) rename src/templates/{dnsbl => dbl}/index.html (94%) rename src/templates/{dnsbl => dbl}/lists/domain.html (90%) rename src/templates/{dnsbl => dbl}/lists/history.html (79%) rename src/templates/{dnsbl => dbl}/lists/index.html (74%) rename src/templates/{dnsbl => dbl}/lists/reports.html (84%) rename src/templates/{dnsbl => dbl}/lists/show.html (84%) rename src/templates/{dnsbl => dbl}/lists/sources.html (89%) rename src/templates/{dnsbl => dbl}/modules/lists.html (85%) rename src/templates/{dnsbl => dbl}/reports/show.html (83%) rename src/templates/{dnsbl => dbl}/reports/submit.html (93%) rename src/templates/{dnsbl => dbl}/reports/submitted.html (86%) rename src/templates/{dnsbl => dbl}/search.html (87%) rename src/web/{dnsbl.py => dbl.py} (71%) diff --git a/Makefile.am b/Makefile.am index a7507b0a..5a523aa8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,7 +57,7 @@ backend_PYTHON = \ src/backend/countries.py \ src/backend/database.py \ src/backend/decorators.py \ - src/backend/dnsbl.py \ + src/backend/dbl.py \ src/backend/fireinfo.py \ src/backend/httpclient.py \ src/backend/hwdata.py \ @@ -87,7 +87,7 @@ web_PYTHON = \ src/web/base.py \ src/web/blog.py \ src/web/boot.py \ - src/web/dnsbl.py \ + src/web/dbl.py \ src/web/docs.py \ src/web/donate.py \ src/web/downloads.py \ @@ -183,33 +183,33 @@ templates_blog_modules_DATA = \ templates_blog_modulesdir = $(templates_blogdir)/modules -templates_dnsbl_DATA = \ - src/templates/dnsbl/index.html \ - src/templates/dnsbl/search.html +templates_dbl_DATA = \ + src/templates/dbl/index.html \ + src/templates/dbl/search.html -templates_dnsbldir = $(templatesdir)/dnsbl +templates_dbldir = $(templatesdir)/dbl -templates_dnsbl_lists_DATA = \ - src/templates/dnsbl/lists/domain.html \ - src/templates/dnsbl/lists/history.html \ - src/templates/dnsbl/lists/index.html \ - src/templates/dnsbl/lists/reports.html \ - src/templates/dnsbl/lists/sources.html \ - src/templates/dnsbl/lists/show.html +templates_dbl_lists_DATA = \ + src/templates/dbl/lists/domain.html \ + src/templates/dbl/lists/history.html \ + src/templates/dbl/lists/index.html \ + src/templates/dbl/lists/reports.html \ + src/templates/dbl/lists/sources.html \ + src/templates/dbl/lists/show.html -templates_dnsbl_listsdir = $(templates_dnsbldir)/lists +templates_dbl_listsdir = $(templates_dbldir)/lists -templates_dnsbl_modules_DATA = \ - src/templates/dnsbl/modules/lists.html +templates_dbl_modules_DATA = \ + src/templates/dbl/modules/lists.html -templates_dnsbl_modulesdir = $(templates_dnsbldir)/modules +templates_dbl_modulesdir = $(templates_dbldir)/modules -templates_dnsbl_reports_DATA = \ - src/templates/dnsbl/reports/show.html \ - src/templates/dnsbl/reports/submit.html \ - src/templates/dnsbl/reports/submitted.html +templates_dbl_reports_DATA = \ + src/templates/dbl/reports/show.html \ + src/templates/dbl/reports/submit.html \ + src/templates/dbl/reports/submitted.html -templates_dnsbl_reportsdir = $(templates_dnsbldir)/reports +templates_dbl_reportsdir = $(templates_dbldir)/reports templates_donate_DATA = \ src/templates/donate/donate.html \ diff --git a/src/backend/base.py b/src/backend/base.py index a3954f63..0c2086a5 100644 --- a/src/backend/base.py +++ b/src/backend/base.py @@ -17,7 +17,7 @@ from . import bugzilla from . import cache from . import campaigns from . import database -from . import dnsbl +from . import dbl from . import fireinfo from . import httpclient from . import iuse @@ -202,8 +202,8 @@ class Backend(object): return campaigns.Campaigns(self) @lazy_property - def dnsbl(self): - return dnsbl.DNSBL(self) + def dbl(self): + return dbl.DBL(self) @lazy_property def groups(self): diff --git a/src/backend/dnsbl.py b/src/backend/dbl.py similarity index 92% rename from src/backend/dnsbl.py rename to src/backend/dbl.py index bae62557..39b42f57 100644 --- a/src/backend/dnsbl.py +++ b/src/backend/dbl.py @@ -19,14 +19,14 @@ from .decorators import * # Setup logging log = logging.getLogger(__name__) -class DNSBL(Object): +class DBL(Object): async def _fetch(self, path, headers=None, args=None, body=None, **kwargs): if headers is None: headers = {} # Format the URL url = urllib.parse.urljoin( - "https://api.dnsbl.ipfire.org", path, + "https://api.dbl.ipfire.org", path, ) # Append any query arguments to the URL @@ -40,7 +40,7 @@ class DNSBL(Object): # Authenticate headers |= { - "X-API-Key" : self.backend.settings.get("dnsbl-api-key", ""), + "X-API-Key" : self.backend.settings.get("dbl-api-key", ""), } # Serialize any content @@ -196,12 +196,12 @@ class List(Model): """ Composes a download URL for this list """ - return os.path.join("https://dnsbl.ipfire.org/lists/%s" % self.slug, *args) + return os.path.join("https://dbl.ipfire.org/lists/%s" % self.slug, *args) # Sources async def get_sources(self): - response = await self._backend.dnsbl._fetch("/lists/%s/sources" % self.slug) + response = await self._backend.dbl._fetch("/lists/%s/sources" % self.slug) return [Source(self._backend, **data) for data in response] @@ -214,7 +214,7 @@ class List(Model): } # Send the request - response = await self._backend.dnsbl._fetch( + response = await self._backend.dbl._fetch( "/lists/%s/reports" % self.slug, args=args, ) @@ -242,7 +242,7 @@ class List(Model): } # Submit the report - response = await self._backend.dnsbl._fetch( + response = await self._backend.dbl._fetch( "/lists/%s/reports" % self.slug, method="POST", body=body, ) @@ -255,7 +255,7 @@ class List(Model): """ Fetches the history of this list """ - response = await self._backend.dnsbl._fetch( + response = await self._backend.dbl._fetch( "/lists/%s/history" % self.slug, args={ "before" : before, "limit" : limit }, ) @@ -265,7 +265,7 @@ class List(Model): """ Fetches the history of a specific domain on this list """ - response = await self._backend.dnsbl._fetch( + response = await self._backend.dbl._fetch( "/lists/%s/domains/%s" % (self.slug, name), ) @@ -363,7 +363,7 @@ class Report(Model): async def get_list(self): if not hasattr(self, "_list"): - self._list = await self._backend.dnsbl.get_list(self.list_slug) + self._list = await self._backend.dbl.get_list(self.list_slug) return self._list diff --git a/src/templates/base.html b/src/templates/base.html index 8bb2d1a8..e30694e1 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -21,13 +21,13 @@ -