]> git.ipfire.org Git - ipfire.org.git/commitdiff
dbl: Rename the DNS Blocklist Project to "IPFire DBL" master
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Jan 2026 12:42:40 +0000 (12:42 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Jan 2026 12:42:40 +0000 (12:42 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
19 files changed:
Makefile.am
src/backend/base.py
src/backend/dbl.py [moved from src/backend/dnsbl.py with 92% similarity]
src/templates/base.html
src/templates/dbl/index.html [moved from src/templates/dnsbl/index.html with 94% similarity]
src/templates/dbl/lists/domain.html [moved from src/templates/dnsbl/lists/domain.html with 90% similarity]
src/templates/dbl/lists/history.html [moved from src/templates/dnsbl/lists/history.html with 79% similarity]
src/templates/dbl/lists/index.html [moved from src/templates/dnsbl/lists/index.html with 74% similarity]
src/templates/dbl/lists/reports.html [moved from src/templates/dnsbl/lists/reports.html with 84% similarity]
src/templates/dbl/lists/show.html [moved from src/templates/dnsbl/lists/show.html with 84% similarity]
src/templates/dbl/lists/sources.html [moved from src/templates/dnsbl/lists/sources.html with 89% similarity]
src/templates/dbl/modules/lists.html [moved from src/templates/dnsbl/modules/lists.html with 85% similarity]
src/templates/dbl/reports/show.html [moved from src/templates/dnsbl/reports/show.html with 83% similarity]
src/templates/dbl/reports/submit.html [moved from src/templates/dnsbl/reports/submit.html with 93% similarity]
src/templates/dbl/reports/submitted.html [moved from src/templates/dnsbl/reports/submitted.html with 86% similarity]
src/templates/dbl/search.html [moved from src/templates/dnsbl/search.html with 87% similarity]
src/templates/static/sitemap.html
src/web/__init__.py
src/web/dbl.py [moved from src/web/dnsbl.py with 71% similarity]

index a7507b0a9b8283e79070ce69602528e5299dde80..5a523aa89be5b7c858e6e91d361e3854d3618068 100644 (file)
@@ -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 \
index a3954f6327b1867d7d4e96f8eb2bedd84b69b78a..0c2086a5a19b86d6b62e937c983d1dc04e4a7d32 100644 (file)
@@ -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):
similarity index 92%
rename from src/backend/dnsbl.py
rename to src/backend/dbl.py
index bae62557ff9e31b209062e68340a33a5f3a233ca..39b42f57766a10241c0b60235db43b85de722d5f 100644 (file)
@@ -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
 
index 8bb2d1a80bf067fbf010c6b5e2d71a2b4eef2223..e30694e11cd7faf1e4557187fed7d713bbdd1722 100644 (file)
        </head>
 
        <body class="is-flex is-flex-direction-column">
-               <nav class="navbar {% if request.path.startswith("/dnsbl") %}is-dark{% end %}"
+               <nav class="navbar {% if request.path.startswith("/dbl") %}is-dark{% end %}"
                                role="navigation" aria-label="main navigation">
                        <div class="container">
                                <div class="navbar-brand is-size-4">
-                                       {% if request.path.startswith("/dnsbl") %}
-                                               <a class="navbar-item" href="/dnsbl">
-                                                       {% module IPFireLogo("DNSBL") %}
+                                       {% if request.path.startswith("/dbl") %}
+                                               <a class="navbar-item" href="/dbl">
+                                                       {% module IPFireLogo("DBL") %}
                                                </a>
 
                                                {# Beta #}
                                                                        </div>
                                                                {% end %}
 
-                                                               {# DNSBL #}
-                                                               {% if request.path.startswith("/dnsbl") %}
+                                                               {# DBL #}
+                                                               {% if request.path.startswith("/dbl") %}
                                                                        <a class="navbar-item is-tab
-                                                                                       {% if request.path.startswith("/dnsbl/lists") %}is-active{% end %}"
-                                                                                       href="/dnsbl/lists">
+                                                                                       {% if request.path.startswith("/dbl/lists") %}is-active{% end %}"
+                                                                                       href="/dbl/lists">
                                                                                {{ _("Lists") }}
                                                                        </a>
 
                                                                        <a class="navbar-item is-tab
-                                                                                       {% if request.path.startswith("/dnsbl/report") %}is-active{% end %}"
-                                                                                       href="/dnsbl/report">
+                                                                                       {% if request.path.startswith("/dbl/report") %}is-active{% end %}"
+                                                                                       href="/dbl/report">
                                                                                {{ _("Report") }}
                                                                        </a>
 
                                                                        <div class="navbar-item">
-                                                                               <form action="/dnsbl/search" method="GET">
+                                                                               <form action="/dbl/search" method="GET">
                                                                                        <div class="field">
                                                                                                <div class="control has-icons-left">
                                                                                                        <input class="input" type="text"
                                                                                                                name="q" {% if q %}value="{{ q }}"{% end %}
-                                                                                                               placeholder="{{ _("Search DNSBL...") }}">
+                                                                                                               placeholder="{{ _("Search DBL...") }}">
                                                                                                        <span class="icon is-small is-left">
                                                                                                                <i class="fas fa-search"></i>
                                                                                                        </span>
similarity index 94%
rename from src/templates/dnsbl/index.html
rename to src/templates/dbl/index.html
index 94a531da5c388241a64df873dbce0c73ec1ae689..8c581df0881520a54c579e8e2511d43fff9eac6b 100644 (file)
@@ -2,18 +2,18 @@
 
 {% block head %}
        {% module OpenGraph(
-               title=_("IPFire DNSBL"),
+               title=_("IPFire DBL"),
                description="High-quality DNS blocklists for security-critical environments",
        ) %}
 {% end block %}
 
-{% block title %}{{ _("Welcome to IPFire DNSBL") }}{% end block %}
+{% block title %}{{ _("Welcome to IPFire DBL") }}{% end block %}
 
 {% block container %}
        <section class="hero is-medium is-primary">
                <div class="hero-body">
                        <div class="container">
-                               <h1 class="title">{{ _("IPFire DNS Blocklist") }}</h1>
+                               <h1 class="title">{{ _("IPFire Domain Blocklist") }}</h1>
 
                                <h6 class="subtitle mb-6">
                                        {{ _("Early threat mitigation, enforced over DNS") }}
                                                <i class="fa-solid fa-heart"></i>
                                        </span>
                                        <span>
-                                               Help keep the Internet safe and free — support IPFire DNSBL today
+                                               Help keep the Internet safe and free — support IPFire DBL today
                                        </span>
                                </a>
                        </div>
similarity index 90%
rename from src/templates/dnsbl/lists/domain.html
rename to src/templates/dbl/lists/domain.html
index b1732e33485de99f17cbcbcf5181c076fd850b77..9afb80089326a68ebf68191a314e46a038a45a6a 100644 (file)
@@ -2,14 +2,14 @@
 
 {% block head %}
        {% module OpenGraph(
-               title=_("IPFire DNSBL - %(list)s - Domain %(domain)s") %\
+               title=_("IPFire DBL - %(list)s - Domain %(domain)s") %\
                        { "list" : list, "domain" : name },
                description=list.description,
        ) %}
 {% end block %}
 
 {% block title %}
-       {{ _("IPFire DNSBL") }} - {{ list }} - {{ _("Domain %s") % name }}
+       {{ _("IPFire DBL") }} - {{ list }} - {{ _("Domain %s") % name }}
 {% end block %}
 
 {% block container %}
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="/dnsbl">
-                                                               {{ _("IPFire DNSBL") }}
+                                                       <a href="/dbl">
+                                                               {{ _("IPFire DBL") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists">
+                                                       <a href="/dbl/lists">
                                                                {{ _("Lists") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists/{{ list.slug }}">
+                                                       <a href="/dbl/lists/{{ list.slug }}">
                                                                {{ list }}
                                                        </a>
                                                </li>
                                                        </strong>
                                                {% end %}
 
-                                               {{ _("Send a report and help us to improve IPFire DNSBL.") }}
+                                               {{ _("Send a report and help us to improve IPFire DBL.") }}
                                        </div>
 
                                        <div class="column is-narrow">
-                                               <a class="button is-primary is-small" href="/dnsbl/report?list={{ list.slug }}&amp;name={{ name }}">
+                                               <a class="button is-primary is-small" href="/dbl/report?list={{ list.slug }}&amp;name={{ name }}">
                                                        {{ _("Report %s") % name }}
                                                </a>
                                        </div>
similarity index 79%
rename from src/templates/dnsbl/lists/history.html
rename to src/templates/dbl/lists/history.html
index 360e27a34aedc91a47f93a0af4ae9fd7297bdee5..adc4ac1bf44cf4d5a53790bb1182e7d8bead3c09 100644 (file)
@@ -2,12 +2,12 @@
 
 {% block head %}
        {% module OpenGraph(
-               title=_("IPFire DNSBL - %s - History") % list,
+               title=_("IPFire DBL - %s - History") % list,
                description=list.description,
        ) %}
 {% end block %}
 
-{% block title %}{{ _("IPFire DNSBL") }} - {{ list }} - {{ _("History") }}{% end block %}
+{% block title %}{{ _("IPFire DBL") }} - {{ list }} - {{ _("History") }}{% end block %}
 
 {% block container %}
        {% import urllib.parse %}
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="/dnsbl">
-                                                               {{ _("IPFire DNSBL") }}
+                                                       <a href="/dbl">
+                                                               {{ _("IPFire DBL") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists">
+                                                       <a href="/dbl/lists">
                                                                {{ _("Lists") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists/{{ list.slug }}">
+                                                       <a href="/dbl/lists/{{ list.slug }}">
                                                                {{ list }}
                                                        </a>
                                                </li>
@@ -81,7 +81,7 @@
                                        {# Domains Allowed #}
                                        {% for domain in event.domains_allowed %}
                                                <li title="{{ _("Allowed") }}">
-                                                       <a class="has-text-info" href="/dnsbl/lists/{{ list.slug }}/domains/{{ domain }}">
+                                                       <a class="has-text-info" href="/dbl/lists/{{ list.slug }}/domains/{{ domain }}">
                                                                &plus; {{ format_domain(domain) }}
                                                        </a>
                                                </li>
@@ -90,7 +90,7 @@
                                        {# Domains Blocked #}
                                        {% for domain in event.domains_blocked %}
                                                <li title="{{ _("Blocked") }}">
-                                                       <a class="has-text-success" href="/dnsbl/lists/{{ list.slug }}/domains/{{ domain }}">
+                                                       <a class="has-text-success" href="/dbl/lists/{{ list.slug }}/domains/{{ domain }}">
                                                                &plus; {{ format_domain(domain) }}
                                                        </a>
                                                </li>
@@ -99,7 +99,7 @@
                                        {# Domains Removed #}
                                        {% for domain in event.domains_removed %}
                                                <li title="{{ _("Removed") }}">
-                                                       <a class="has-text-danger" href="/dnsbl/lists/{{ list.slug }}/domains/{{ domain }}">
+                                                       <a class="has-text-danger" href="/dbl/lists/{{ list.slug }}/domains/{{ domain }}">
                                                                &minus; {{ format_domain(domain) }}
                                                        </a>
                                                </li>
                                {% set before = min(e.ts for e in history) %}
 
                                <a class="pagination-next"
-                                               href="/dnsbl/lists/{{ list.slug }}/history?before={{ urllib.parse.quote(before.isoformat()) }}">
+                                               href="/dbl/lists/{{ list.slug }}/history?before={{ urllib.parse.quote(before.isoformat()) }}">
                                        {{ _("Older") }} &raquo;
                                </a>
                        </nav>
similarity index 74%
rename from src/templates/dnsbl/lists/index.html
rename to src/templates/dbl/lists/index.html
index a22e466fa1d7aee032ca396d3c5378d156f93594..26ca6bf0a32496257b4781c53c1648a3c340c628 100644 (file)
@@ -2,11 +2,11 @@
 
 {% block head %}
        {% module OpenGraph(
-               title=_("IPFire DNSBL - Lists"),
+               title=_("IPFire DBL - Lists"),
        ) %}
 {% end block %}
 
-{% block title %}{{ _("IPFire DNSBL") }} - {{ _("Lists") }}{% end block %}
+{% block title %}{{ _("IPFire DBL") }} - {{ _("Lists") }}{% end block %}
 
 {% block container %}
        <section class="hero is-dark">
@@ -15,8 +15,8 @@
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="/dnsbl">
-                                                               {{ _("IPFire DNSBL") }}
+                                                       <a href="/dbl">
+                                                               {{ _("IPFire DBL") }}
                                                        </a>
                                                </li>
 
@@ -35,7 +35,7 @@
 
        <section class="section">
                <div class="container">
-                       {% module DNSBLLists(lists) %}
+                       {% module DBLLists(lists) %}
                </div>
        </section>
 {% end block %}
similarity index 84%
rename from src/templates/dnsbl/lists/reports.html
rename to src/templates/dbl/lists/reports.html
index f586318783471a85791767c6a0d40f1940863729..457498d4b365ffa9fcc0324e356f5b77d8a2080c 100644 (file)
@@ -2,12 +2,12 @@
 
 {% block head %}
        {% module OpenGraph(
-               title=_("IPFire DNSBL - %s - Reports") % list,
+               title=_("IPFire DBL - %s - Reports") % list,
                description=list.description,
        ) %}
 {% end block %}
 
-{% block title %}{{ _("IPFire DNSBL") }} - {{ list }} - {{ _("Reports") }}{% end block %}
+{% block title %}{{ _("IPFire DBL") }} - {{ list }} - {{ _("Reports") }}{% end block %}
 
 {% block container %}
        <section class="hero is-dark">
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="/dnsbl">
-                                                               {{ _("IPFire DNSBL") }}
+                                                       <a href="/dbl">
+                                                               {{ _("IPFire DBL") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists">
+                                                       <a href="/dbl/lists">
                                                                {{ _("Lists") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists/{{ list.slug }}">
+                                                       <a href="/dbl/lists/{{ list.slug }}">
                                                                {{ list }}
                                                        </a>
                                                </li>
@@ -61,7 +61,7 @@
                                                                <div class="columns">
                                                                        <div class="column">
                                                                                <p class="title is-5">
-                                                                                       <a href="/dnsbl/reports/{{ report.id }}">
+                                                                                       <a href="/dbl/reports/{{ report.id }}">
                                                                                                {{ report }}
                                                                                        </a>
                                                                                </p>
                                Spot something that should be listed? Send it our way.
                        </div>
 
-                       <a class="button is-primary" href="/dnsbl/report">
+                       <a class="button is-primary" href="/dbl/report">
                                {{ _("Submit a Report") }}
                        </a>
                </div>
similarity index 84%
rename from src/templates/dnsbl/lists/show.html
rename to src/templates/dbl/lists/show.html
index c3c392ceb95167cb169a52aa25ff8143f63ca12b..7c9e432fb7ed3e726ad1445e8aa446d5c28ee8b2 100644 (file)
@@ -2,12 +2,12 @@
 
 {% block head %}
        {% module OpenGraph(
-               title=_("IPFire DNSBL - %s") % list,
+               title=_("IPFire DBL - %s") % list,
                description=list.description,
        ) %}
 {% end block %}
 
-{% block title %}{{ _("IPFire DNSBL") }} - {{ list }}{% end block %}
+{% block title %}{{ _("IPFire DBL") }} - {{ list }}{% end block %}
 
 {% block container %}
        {% import urllib.parse %}
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="/dnsbl">
-                                                               {{ _("IPFire DNSBL") }}
+                                                       <a href="/dbl">
+                                                               {{ _("IPFire DBL") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists">
+                                                       <a href="/dbl/lists">
                                                                {{ _("Lists") }}
                                                        </a>
                                                </li>
@@ -82,7 +82,7 @@
 
                        {# Navigation #}
                        <div class="buttons are-small is-centered">
-                               <a class="button" href="/dnsbl/lists/{{ list.slug }}/reports">
+                               <a class="button" href="/dbl/lists/{{ list.slug }}/reports">
                                        <span class="icon is-small">
                                                <i class="fa-solid fa-flag" aria-hidden="true"></i>
                                        </span>
@@ -96,7 +96,7 @@
                                        </span>
                                </a>
 
-                               <a class="button" href="/dnsbl/lists/{{ list.slug }}/sources">
+                               <a class="button" href="/dbl/lists/{{ list.slug }}/sources">
                                        <span class="icon is-small">
                                                <i class="fas fa-code-pull-request" aria-hidden="true"></i>
                                        </span>
                                        <span>{{ _("Sources") }}</span>
                                </a>
 
-                               <a class="button" href="/dnsbl/lists/{{ list.slug }}/history">
+                               <a class="button" href="/dbl/lists/{{ list.slug }}/history">
                                        <span class="icon is-small">
                                                <i class="fas fa-list-check" aria-hidden="true"></i>
                                        </span>
                                        {% set url = "https://subscribe.adblockplus.org/?%s" % \
                                                urllib.parse.urlencode({
                                                        "location" : list.url("abp.txt"),
-                                                       "title"    : "IPFire DNSBL - %s" % list,
+                                                       "title"    : "IPFire DBL - %s" % list,
                                                })
                                        %}
 
                        <div id="rpz" class="tab-content is-hidden">
                                <div class="content">
                                        <p>
-                                               The IPFire DNSBL is published as a Response Policy Zone (RPZ) and
+                                               The IPFire DBL is published as a Response Policy Zone (RPZ) and
                                                can be consumed by many popular recursive DNS resolvers.
                                        </p>
 
@@ -200,7 +200,7 @@ recursor:
 &nbsp;&nbsp;rpzs:
 &nbsp;&nbsp;- name: {{ list.slug }}.rpz.ipfire.org
 &nbsp;&nbsp;&nbsp;&nbsp;addresses:
-&nbsp;&nbsp;&nbsp;&nbsp;- 'primary.dnsbl.ipfire.org'</pre>
+&nbsp;&nbsp;&nbsp;&nbsp;- 'primary.dbl.ipfire.org'</pre>
 
                                        <h6>Unbound</h6>
 
@@ -210,7 +210,7 @@ server:
 
 rpz:
 &nbsp;&nbsp;name: {{ list.slug }}.rpz.ipfire.org
-&nbsp;&nbsp;primary: primary.dnsbl.ipfire.org
+&nbsp;&nbsp;primary: primary.dbl.ipfire.org
 &nbsp;&nbsp;zonefile: /var/cache/unbound/{{ list.slug }}.rpz.ipfire.org.zone</pre>
                                </div>
                        </div>
@@ -218,7 +218,7 @@ rpz:
                        <div id="alternative" class="tab-content is-hidden">
                                <div class="content">
                                        <p>
-                                               All IPFire DNSBL lists are also available as downloadable domain and hosts files.
+                                               All IPFire DBL lists are also available as downloadable domain and hosts files.
                                        </p>
 
                                        <p>
@@ -229,7 +229,7 @@ rpz:
                                </div>
 
                                <div class="buttons are-small">
-                                       <a class="button is-primary" href="https://dnsbl.ipfire.org/lists/{{ list.slug }}/domains.txt">
+                                       <a class="button is-primary" href="https://dbl.ipfire.org/lists/{{ list.slug }}/domains.txt">
                                                <span class="icon">
                                                         <i class="fas fa-download"></i>
                                                </span>
@@ -239,7 +239,7 @@ rpz:
                                                </span>
                                        </a>
 
-                                       <a class="button is-primary" href="https://dnsbl.ipfire.org/lists/{{ list.slug }}/hosts.txt">
+                                       <a class="button is-primary" href="https://dbl.ipfire.org/lists/{{ list.slug }}/hosts.txt">
                                                <span class="icon">
                                                         <i class="fas fa-download"></i>
                                                </span>
similarity index 89%
rename from src/templates/dnsbl/lists/sources.html
rename to src/templates/dbl/lists/sources.html
index b19cf1a5ebb5684ae6b6e6a0ac2cd38f77ad01bd..efd5295636865dd42740812042c446315c4e2429 100644 (file)
@@ -2,12 +2,12 @@
 
 {% block head %}
        {% module OpenGraph(
-               title=_("IPFire DNSBL - %s - Sources") % list,
+               title=_("IPFire DBL - %s - Sources") % list,
                description=list.description,
        ) %}
 {% end block %}
 
-{% block title %}{{ _("IPFire DNSBL") }} - {{ list }} - {{ _("Sources") }}{% end block %}
+{% block title %}{{ _("IPFire DBL") }} - {{ list }} - {{ _("Sources") }}{% end block %}
 
 {% block container %}
        <section class="hero is-dark">
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="/dnsbl">
-                                                               {{ _("IPFire DNSBL") }}
+                                                       <a href="/dbl">
+                                                               {{ _("IPFire DBL") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists">
+                                                       <a href="/dbl/lists">
                                                                {{ _("Lists") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists/{{ list.slug }}">
+                                                       <a href="/dbl/lists/{{ list.slug }}">
                                                                {{ list }}
                                                        </a>
                                                </li>
similarity index 85%
rename from src/templates/dnsbl/modules/lists.html
rename to src/templates/dbl/modules/lists.html
index c4e657d4cb99f42df3bc9004a32fc23f41911136..553e225d62faac9836dfe7157afdadafb698c92e 100644 (file)
@@ -1,7 +1,7 @@
 {% for l in sorted(lists) %}
        <div class="block">
                <h5 class="title is-5">
-                       <a href="/dnsbl/lists/{{ l.slug }}">
+                       <a href="/dbl/lists/{{ l.slug }}">
                                {{ l }}
                        </a>
                </h5>
similarity index 83%
rename from src/templates/dnsbl/reports/show.html
rename to src/templates/dbl/reports/show.html
index 1d890ac9ca3a624754b882af2e29586e714cd461..4df43eac269622ba663b70e68b055373e685aa60 100644 (file)
@@ -1,7 +1,7 @@
 {% extends "../../base.html" %}
 
 {% block title %}
-       {{ _("IPFire DNSBL") }} {{ _("Report %s") % report }}
+       {{ _("IPFire DBL") }} {{ _("Report %s") % report }}
 {% end block %}
 
 {% block head %}
                                <nav class="breadcrumb" aria-label="breadcrumbs">
                                        <ul>
                                                <li>
-                                                       <a href="/dnsbl">
-                                                               {{ _("IPFire DNSBL") }}
+                                                       <a href="/dbl">
+                                                               {{ _("IPFire DBL") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists">
+                                                       <a href="/dbl/lists">
                                                                {{ _("Lists") }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists/{{ list.slug }}">
+                                                       <a href="/dbl/lists/{{ list.slug }}">
                                                                {{ list.name }}
                                                        </a>
                                                </li>
 
                                                <li>
-                                                       <a href="/dnsbl/lists/{{ list.slug }}/reports">
+                                                       <a href="/dbl/lists/{{ list.slug }}/reports">
                                                                {{ _("Reports") }}
                                                        </a>
                                                </li>
similarity index 93%
rename from src/templates/dnsbl/reports/submit.html
rename to src/templates/dbl/reports/submit.html
index 5db70c19f78df48a0aac08c2f821e8ddc2df141e..9040b1c79e0011377c1a6537f986e988d78ff76b 100644 (file)
@@ -1,13 +1,13 @@
 {% extends "../../base.html" %}
 
 {% block title %}
-       {{ _("IPFire DNSBL") }} {{ _("Report A Domain") }}
+       {{ _("IPFire DBL") }} {{ _("Report A Domain") }}
 {% end block %}
 
 {% block head %}
        {% module OpenGraph(
                title=_("Report A Domain"),
-               description=_("Help Us To Improve IPFire DNSBL"),
+               description=_("Help Us To Improve IPFire DBL"),
        ) %}
 {% end block %}
 
@@ -16,7 +16,7 @@
                <div class="hero-body">
                        <div class="container">
                                <h1 class="title">
-                                       {{ _("Help Us To Improve IPFire DNSBL") }}
+                                       {{ _("Help Us To Improve IPFire DBL") }}
                                </h1>
 
                                <p class="subtitle">
@@ -35,7 +35,7 @@
 
                                        <br>
 
-                                       To keep the IPFire DNSBL accurate and trustworthy, domain reports
+                                       To keep the IPFire DBL accurate and trustworthy, domain reports
                                        can only be submitted by logged-in users.
                                        This helps us prevent spam and abuse, and ensures that every report
                                        comes from a real, accountable community member.
                                                                <p class="help">
                                                                        By submitting your report, you grant the IPFire Project the right to store,
                                                                        process, and publish this information as part of its security services,
-                                                                       including the IPFire DNSBL under the terms of the respective list.
+                                                                       including the IPFire DBL under the terms of the respective list.
                                                                        Submissions may be reviewed, modified, or removed at our discretion.
                                                                </p>
                                                        </div>
similarity index 86%
rename from src/templates/dnsbl/reports/submitted.html
rename to src/templates/dbl/reports/submitted.html
index 043da18772e484aedef01dc33750db54fc20006f..92c6a6167cca85f8156b5a9955b1a6245489162a 100644 (file)
@@ -14,7 +14,7 @@
                                        {{ _("Your report has been submitted") }}
                                </p>
 
-                               <a class="button is-white" href="/dnsbl/reports/{{ report.id }}">
+                               <a class="button is-white" href="/dbl/reports/{{ report.id }}">
                                        {{ _("View Report") }}
                                </a>
                        </div>
similarity index 87%
rename from src/templates/dnsbl/search.html
rename to src/templates/dbl/search.html
index 3cd8ab8d49a5b7569ca5049bd6e1bf9c91709899..5408b10ce254dcec4d3dd850b6a4ba2af13689c8 100644 (file)
@@ -2,7 +2,7 @@
 
 {% block head %}
        {% module OpenGraph(
-               title=_("IPFire DNSBL - Search Results For: %s") % q,
+               title=_("IPFire DBL - Search Results For: %s") % q,
        ) %}
 {% end block %}
 
@@ -26,7 +26,7 @@
                                {% for list, domains in sorted(results.items()) %}
                                        <div class="block">
                                                <h5 class="title is-5">
-                                                       <a href="/dnsbl/lists/{{ list.slug }}">
+                                                       <a href="/dbl/lists/{{ list.slug }}">
                                                                {{ list }}
                                                        </a>
                                                </h5>
@@ -39,7 +39,7 @@
                                                        <ul>
                                                                {% for domain in domains %}
                                                                        <li>
-                                                                               <a href="/dnsbl/lists/{{ list.slug }}/domains/{{ domain }}">
+                                                                               <a href="/dbl/lists/{{ list.slug }}/domains/{{ domain }}">
                                                                                        {{ format_domain(domain) }}
                                                                                </a>
                                                                        </li>
index e4dc742d0dd94cc0cadcc80243b2f3e2290073dc..5d928e7ae3b7856d445a120f1e86eb323c6be910 100644 (file)
                                <div class="columns is-centered is-multiline">
                                        <div class="column is-one-third has-text-centered">
                                                <div>
-                                                       <p class="heading">DNS Blocklists</p>
+                                                       <p class="heading">Domain Blocklists</p>
                                                        <p class="title">
-                                                               <a href="/dnsbl">
-                                                                       {{ _("IPFire DNSBL") }}
+                                                               <a href="/dbl">
+                                                                       {{ _("IPFire DBL") }}
                                                                </a>
                                                        </p>
                                                </div>
index 00db7fe544936e7f2049563d4b212cae8b5ed4c1..bebfa0bcfaec1c377f4e71e38e985d859b9ae135 100644 (file)
@@ -20,7 +20,7 @@ from . import analytics
 from . import auth
 from . import blog
 from . import boot
-from . import dnsbl
+from . import dbl
 from . import docs
 from . import donate
 from . import downloads
@@ -84,8 +84,8 @@ class Application(tornado.web.Application):
                                "BootMenuHeader"       : boot.MenuHeaderModule,
                                "BootMenuSeparator"    : boot.MenuSeparatorModule,
 
-                               # DNSBL
-                               "DNSBLLists"           : dnsbl.ListsModule,
+                               # DBL
+                               "DBLLists"             : dbl.ListsModule,
 
                                # Docs
                                "DocsDiff"             : docs.DiffModule,
@@ -215,17 +215,17 @@ class Application(tornado.web.Application):
                        (r"/location/report\-a\-problem", StaticHandler, { "template" : "location/report-a-problem.html" }),
                        (r"/location/lookup/(.+)", location.LookupHandler),
 
-                       # DNSBL
-                       (r"/dnsbl/?", StaticHandler, { "template" : "dnsbl/index.html" }),
-                       (r"/dnsbl/lists", dnsbl.ListsHandler),
-                       (r"/dnsbl/lists/(\w+)", dnsbl.ListHandler),
-                       (r"/dnsbl/lists/(\w+)/domains/(.*)", dnsbl.ListDomainHandler),
-                       (r"/dnsbl/lists/(\w+)/history", dnsbl.ListHistoryHandler),
-                       (r"/dnsbl/lists/(\w+)/reports", dnsbl.ListReportsHandler),
-                       (r"/dnsbl/lists/(\w+)/sources", dnsbl.ListSourcesHandler),
-                       (r"/dnsbl/report", dnsbl.SubmitReportHandler),
-                       (r"/dnsbl/reports/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})", dnsbl.ReportHandler),
-                       (r"/dnsbl/search", dnsbl.SearchHandler),
+                       # DBL
+                       (r"/dbl/?", StaticHandler, { "template" : "dbl/index.html" }),
+                       (r"/dbl/lists", dbl.ListsHandler),
+                       (r"/dbl/lists/(\w+)", dbl.ListHandler),
+                       (r"/dbl/lists/(\w+)/domains/(.*)", dbl.ListDomainHandler),
+                       (r"/dbl/lists/(\w+)/history", dbl.ListHistoryHandler),
+                       (r"/dbl/lists/(\w+)/reports", dbl.ListReportsHandler),
+                       (r"/dbl/lists/(\w+)/sources", dbl.ListSourcesHandler),
+                       (r"/dbl/report", dbl.SubmitReportHandler),
+                       (r"/dbl/reports/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})", dbl.ReportHandler),
+                       (r"/dbl/search", dbl.SearchHandler),
 
                        # Single-Sign-On for Discourse
                        (r"/sso/discourse", auth.SSODiscourse),
@@ -350,9 +350,9 @@ class Application(tornado.web.Application):
                                tornado.web.StaticFileHandler, { "path" : BOOT_STATIC_PATH }),
                ])
 
-               # dnsbl.ipfire.org
-               self.add_handlers(r"dnsbl\.([a-z]+\.dev\.)?ipfire\.org", [
-                       (r"(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/dnsbl{0}" }),
+               # dbl.ipfire.org
+               self.add_handlers(r"dbl\.([a-z]+\.dev\.)?ipfire\.org", [
+                       (r"(.*)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/dbl{0}" }),
                ])
 
                # nopaste.ipfire.org
similarity index 71%
rename from src/web/dnsbl.py
rename to src/web/dbl.py
index 540b2a16f09067d1ab44374aa178c271d95e4388..0d370fc666e6897d0a90f8aa7aa5768e98c735c3 100644 (file)
@@ -9,33 +9,33 @@ class BaseHandler(base.BaseHandler):
                slug = self.get_argument(*args, **kwargs)
 
                # Fetch the list
-               return await self.backend.dnsbl.get_list(slug)
+               return await self.backend.dbl.get_list(slug)
 
 
 class ListsHandler(base.AnalyticsMixin, BaseHandler):
        async def get(self):
                # Fetch all lists
-               lists = await self.backend.dnsbl.get_lists()
+               lists = await self.backend.dbl.get_lists()
 
                # Render the page
-               self.render("dnsbl/lists/index.html", lists=lists)
+               self.render("dbl/lists/index.html", lists=lists)
 
 
 class ListHandler(base.AnalyticsMixin, BaseHandler):
        async def get(self, slug):
                # Fetch the list
-               list = await self.backend.dnsbl.get_list(slug)
+               list = await self.backend.dbl.get_list(slug)
                if not list:
                        raise tornado.web.HTTPError(404, "Could not find list '%s'" % slug)
 
                # Render the page
-               self.render("dnsbl/lists/show.html", list=list)
+               self.render("dbl/lists/show.html", list=list)
 
 
 class ListHistoryHandler(base.AnalyticsMixin, BaseHandler):
        async def get(self, slug):
                # Fetch the list
-               list = await self.backend.dnsbl.get_list(slug)
+               list = await self.backend.dbl.get_list(slug)
                if not list:
                        raise tornado.web.HTTPError(404, "Could not find list '%s'" % slug)
 
@@ -46,13 +46,13 @@ class ListHistoryHandler(base.AnalyticsMixin, BaseHandler):
                )
 
                # Render the page
-               self.render("dnsbl/lists/history.html", list=list, history=history)
+               self.render("dbl/lists/history.html", list=list, history=history)
 
 
 class ListReportsHandler(base.AnalyticsMixin, BaseHandler):
        async def get(self, slug):
                # Fetch the list
-               list = await self.backend.dnsbl.get_list(slug)
+               list = await self.backend.dbl.get_list(slug)
                if not list:
                        raise tornado.web.HTTPError(404, "Could not find list '%s'" % slug)
 
@@ -60,13 +60,13 @@ class ListReportsHandler(base.AnalyticsMixin, BaseHandler):
                reports = await list.get_reports(limit=25)
 
                # Render the page
-               self.render("dnsbl/lists/reports.html", list=list, reports=reports)
+               self.render("dbl/lists/reports.html", list=list, reports=reports)
 
 
 class ListSourcesHandler(base.AnalyticsMixin, BaseHandler):
        async def get(self, slug):
                # Fetch the list
-               list = await self.backend.dnsbl.get_list(slug)
+               list = await self.backend.dbl.get_list(slug)
                if not list:
                        raise tornado.web.HTTPError(404, "Could not find list '%s'" % slug)
 
@@ -74,13 +74,13 @@ class ListSourcesHandler(base.AnalyticsMixin, BaseHandler):
                sources = await list.get_sources()
 
                # Render the page
-               self.render("dnsbl/lists/sources.html", list=list, sources=sources)
+               self.render("dbl/lists/sources.html", list=list, sources=sources)
 
 
 class ListDomainHandler(base.AnalyticsMixin, BaseHandler):
        async def get(self, slug, name):
                # Fetch the list
-               list = await self.backend.dnsbl.get_list(slug)
+               list = await self.backend.dbl.get_list(slug)
                if not list:
                        raise tornado.web.HTTPError(404, "Could not find list '%s'" % slug)
 
@@ -88,13 +88,13 @@ class ListDomainHandler(base.AnalyticsMixin, BaseHandler):
                events = await list.get_domain_history(name)
 
                # Render the page
-               self.render("dnsbl/lists/domain.html", list=list, name=name, events=events)
+               self.render("dbl/lists/domain.html", list=list, name=name, events=events)
 
 
 class SubmitReportHandler(base.AnalyticsMixin, BaseHandler):
        async def get(self):
                # Fetch all lists
-               lists = await self.backend.dnsbl.get_lists()
+               lists = await self.backend.dbl.get_lists()
 
                # Fetch any pre-selected lists
                list = await self.get_list("list", None)
@@ -103,7 +103,7 @@ class SubmitReportHandler(base.AnalyticsMixin, BaseHandler):
                name = self.get_argument("name", None)
 
                # Render the page
-               self.render("dnsbl/reports/submit.html", lists=lists, list=list, name=name)
+               self.render("dbl/reports/submit.html", lists=lists, list=list, name=name)
 
        @tornado.web.authenticated
        #@base.ratelimit(minutes=60, requests=10)
@@ -120,20 +120,20 @@ class SubmitReportHandler(base.AnalyticsMixin, BaseHandler):
                )
 
                # Render a result page
-               self.render("dnsbl/reports/submitted.html", report=report)
+               self.render("dbl/reports/submitted.html", report=report)
 
 
 class ReportHandler(base.AnalyticsMixin, BaseHandler):
        async def get(self, id):
                # Fetch the report
-               report = await self.backend.dnsbl.get_report(id)
+               report = await self.backend.dbl.get_report(id)
                if not report:
                        raise tornado.web.HTTPError(404, "Could not find report '%s'" % id)
 
                # Fetch the list
                list = await report.get_list()
 
-               self.render("dnsbl/reports/show.html", report=report, list=list)
+               self.render("dbl/reports/show.html", report=report, list=list)
 
 
 class SearchHandler(base.AnalyticsMixin, BaseHandler):
@@ -146,12 +146,12 @@ class SearchHandler(base.AnalyticsMixin, BaseHandler):
                        raise tornado.web.HTTPError(400, "Empty search query")
 
                # Search for the query
-               results = await self.backend.dnsbl.search(q)
+               results = await self.backend.dbl.search(q)
 
                # Render the page
-               self.render("dnsbl/search.html", q=q, results=results)
+               self.render("dbl/search.html", q=q, results=results)
 
 
 class ListsModule(ui_modules.UIModule):
        def render(self, lists):
-               return self.render_string("dnsbl/modules/lists.html", lists=lists)
+               return self.render_string("dbl/modules/lists.html", lists=lists)