From: Aleš Mrázek <ales.mrazek@nic.cz>
Date: Wed, 27 Apr 2022 10:30:48 +0000 (+0200)
Subject: manager: datamodel: PROXYv2 option renamed
X-Git-Tag: v6.0.0a1~36^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0eb06177746438e83e654c878acb02f41017698f;p=thirdparty%2Fknot-resolver.git

manager: datamodel: PROXYv2 option renamed
---

diff --git a/manager/knot_resolver_manager/datamodel/network_schema.py b/manager/knot_resolver_manager/datamodel/network_schema.py
index b7bdd298f..9bc970807 100644
--- a/manager/knot_resolver_manager/datamodel/network_schema.py
+++ b/manager/knot_resolver_manager/datamodel/network_schema.py
@@ -134,7 +134,7 @@ class ListenSchema(SchemaNode):
             )
 
 
-class PROXYv2Schema(SchemaNode):
+class ProxyProtocolSchema(SchemaNode):
     """
     PROXYv2 protocol configuration.
 
@@ -159,7 +159,7 @@ class NetworkSchema(SchemaNode):
     edns_buffer_size: Maximum EDNS payload size advertised in DNS packets. Different values can be configured for communication downstream (towards clients) and upstream (towards other DNS servers).
     address_renumbering: Renumbers addresses in answers to different address space.
     tls: TLS configuration, also affects DNS over TLS and DNS over HTTPS.
-    proxy_v2: PROXYv2 protocol configuration.
+    proxy_protocol: PROXYv2 protocol configuration.
     listen: List of interfaces to listen to and its configuration.
     """
 
@@ -172,7 +172,7 @@ class NetworkSchema(SchemaNode):
     edns_buffer_size: EdnsBufferSizeSchema = EdnsBufferSizeSchema()
     address_renumbering: Optional[List[AddressRenumberingSchema]] = None
     tls: TLSSchema = TLSSchema()
-    proxy_v2: Union[Literal[False], PROXYv2Schema] = False
+    proxy_protocol: Union[Literal[False], ProxyProtocolSchema] = False
     listen: List[ListenSchema] = [
         ListenSchema({"interface": "127.0.0.1"}),
         ListenSchema({"interface": "::1", "freebind": True}),
diff --git a/manager/knot_resolver_manager/datamodel/templates/network.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
index 229777534..60b09652c 100644
--- a/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
+++ b/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
@@ -84,10 +84,10 @@ modules.load('http')
 {{ http_config(cfg.network.tls,"doh_legacy") }}
 {% endif %}
 
-{% if cfg.network.proxy_v2 %}
--- network.proxy-v2
+{% if cfg.network.proxy_protocol %}
+-- network.proxy-protocol
 net.proxy_allowed({
-{% for item in cfg.network.proxy_v2.allow %}
+{% for item in cfg.network.proxy_protocol.allow %}
 '{{ item }}',
 {% endfor %}
 })