datamodel: remove /local-data/root-fallback-addresses*

As discussed, let's keep rarely useful settings out of the YAML model.

diff --git a/NEWS b/NEWS
index ac83edbf14d15a3b75378f0ed59f9a08074963b2..d3fa1eaa842e382b1b6266bda35fa9954c6fcbb9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Incompatible changes
   - /dnssec/refresh-time
   - /dnssec/hold-down-time
   - /dnssec/time-skew-detection
+  - /local-data/root-fallback-addresses*
   - /logging/debugging
   - /max-workers
   - /network/tls/auto-discovery

diff --git a/doc/_static/config.schema.json b/doc/_static/config.schema.json
index 3d0c0cfdfa869c6c7031bc60ae4cb17397a43d67..03387f25dcadfe55e4ce41de462e22dbee8841ba 100644 (file)
--- a/doc/_static/config.schema.json
+++ b/doc/_static/config.schema.json
@@ -621,48 +621,6 @@
                     "description": "Use NODATA synthesis. NODATA will be synthesised for matching name, but mismatching type(e.g. AAAA query when only A exists).",
                     "default": true
                 },
-                "root-fallback-addresses": {
-                    "type": [
-                        "object",
-                        "null"
-                    ],
-                    "additionalProperties": {
-                        "anyOf": [
-                            {
-                                "type": "array",
-                                "items": {
-                                    "anyOf": [
-                                        {
-                                            "type": "string"
-                                        },
-                                        {
-                                            "type": "string"
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "type": "string"
-                            },
-                            {
-                                "type": "string"
-                            }
-                        ]
-                    },
-                    "description": "Direct replace of root hints.",
-                    "default": null
-                },
-                "root-fallback-addresses-files": {
-                    "type": [
-                        "array",
-                        "null"
-                    ],
-                    "items": {
-                        "type": "string"
-                    },
-                    "description": "Direct replace of root hints from a zonefile.",
-                    "default": null
-                },
                 "addresses": {
                     "type": [
                         "object",
@@ -919,8 +877,6 @@
             "default": {
                 "ttl": null,
                 "nodata": true,
-                "root_fallback_addresses": null,
-                "root_fallback_addresses_files": null,
                 "addresses": null,
                 "addresses_files": null,
                 "records": null,

diff --git a/python/knot_resolver/datamodel/local_data_schema.py b/python/knot_resolver/datamodel/local_data_schema.py
index 12a59301e3f0394cccbae2473aafbd2eb85afedc..58a88fa8f450d9190f810a3fce43f2c3b3f742ad 100644 (file)
--- a/python/knot_resolver/datamodel/local_data_schema.py
+++ b/python/knot_resolver/datamodel/local_data_schema.py
@@ -100,8 +100,6 @@ class LocalDataSchema(ConfigSchema):
     ---
     ttl: Default TTL value used for added local data/records.
     nodata: Use NODATA synthesis. NODATA will be synthesised for matching name, but mismatching type(e.g. AAAA query when only A exists).
-    root_fallback_addresses: Direct replace of root hints.
-    root_fallback_addresses_files: Direct replace of root hints from a zonefile.
     addresses: Direct addition of hostname and IP addresses pairs.
     addresses_files: Direct addition of hostname and IP addresses pairs from files in '/etc/hosts' like format.
     records: Direct addition of records in DNS zone file format.
@@ -111,10 +109,9 @@ class LocalDataSchema(ConfigSchema):
 
     ttl: Optional[TimeUnit] = None
     nodata: bool = True
-    root_fallback_addresses: Optional[Dict[DomainName, ListOrItem[IPAddress]]] = None
-    root_fallback_addresses_files: Optional[List[ReadableFile]] = None
     addresses: Optional[Dict[DomainName, ListOrItem[IPAddress]]] = None
     addresses_files: Optional[List[ReadableFile]] = None
     records: Optional[EscapedStr] = None
     rules: Optional[List[RuleSchema]] = None
     rpz: Optional[List[RPZSchema]] = None
+    # root_fallback_addresses*: removed, rarely useful

diff --git a/python/knot_resolver/datamodel/templates/local_data.lua.j2 b/python/knot_resolver/datamodel/templates/local_data.lua.j2
index 78e167382fa45348a04ba1fb3ffd06007858fc81..207b1743baf10121b705c4ecde6cf6afaa7de1f6 100644 (file)
--- a/python/knot_resolver/datamodel/templates/local_data.lua.j2
+++ b/python/knot_resolver/datamodel/templates/local_data.lua.j2
@@ -1,18 +1,8 @@
-{% from 'macros/local_data_macros.lua.j2' import local_data_rules, local_data_records, local_data_root_fallback_addresses, local_data_root_fallback_addresses_files, local_data_addresses, local_data_addresses_files %}
+{% from 'macros/local_data_macros.lua.j2' import local_data_rules, local_data_records, local_data_addresses, local_data_addresses_files %}
 {% from 'macros/common_macros.lua.j2' import boolean %}
 
 modules = { 'hints > iterate' }
 
-{# root-fallback-addresses #}
-{% if cfg.local_data.root_fallback_addresses -%}
-{{ local_data_root_fallback_addresses(cfg.local_data.root_fallback_addresses) }}
-{%- endif %}
-
-{# root-fallback-addresses-files #}
-{% if cfg.local_data.root_fallback_addresses_files -%}
-{{ local_data_root_fallback_addresses_files(cfg.local_data.root_fallback_addresses_files) }}
-{%- endif %}
-
 {# addresses #}
 {% if cfg.local_data.addresses -%}
 {{ local_data_addresses(cfg.local_data.addresses, cfg.local_data.nodata, cfg.local_data.ttl) }}

diff --git a/python/knot_resolver/datamodel/templates/macros/local_data_macros.lua.j2 b/python/knot_resolver/datamodel/templates/macros/local_data_macros.lua.j2
index 92405a5a3ef9fb9ca644432e814f7a4712de65ea..2533064cb8d553272d30c8c02d8121413870a0d3 100644 (file)
--- a/python/knot_resolver/datamodel/templates/macros/local_data_macros.lua.j2
+++ b/python/knot_resolver/datamodel/templates/macros/local_data_macros.lua.j2
@@ -2,21 +2,6 @@
 {% from 'macros/policy_macros.lua.j2' import policy_get_tagset, policy_todname %}
 
 
-{% macro local_data_root_fallback_addresses(pairs) -%}
-hints.root({
-{% for name, addresses in pairs.items() %}
-  ['{{ name }}']={{ string_table(addresses) }},
-{% endfor %}
-})
-{%- endmacro %}
-
-
-{% macro local_data_root_fallback_addresses_files(files) -%}
-{% for file in files %}
-hints.root_file('{{ file }}')
-{% endfor %}
-{%- endmacro %}
-
 {%- macro local_data_ttl(ttl) -%}
 {%- if ttl -%}
 {{ ttl.seconds() }}