From: Vladimír Čunát Date: Wed, 8 May 2024 06:31:32 +0000 (+0200) Subject: datamodel: remove /local-data/root-fallback-addresses* X-Git-Tag: v6.0.17~9^2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=081910ca501bfbf273ca6a2043e39614adf3dacf;p=thirdparty%2Fknot-resolver.git 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 7d20e2dbe..cba8931f2 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,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 a985f8fb5..85335e277 100644 --- a/doc/_static/config.schema.json +++ b/doc/_static/config.schema.json @@ -627,48 +627,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", @@ -925,8 +883,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 12a59301e..58a88fa8f 100644 --- 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 78e167382..207b1743b 100644 --- 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 92405a5a3..2533064cb 100644 --- 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() }}