This is an automated email from the ASF dual-hosted git repository.
dmeden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 65f07be4de records.yaml - Rename few records that I missed in the
original (#9897)
65f07be4de is described below
commit 65f07be4de2644f1bf8decdc41f15e6fe5151484
Author: Damian Meden <[email protected]>
AuthorDate: Mon Jun 26 12:19:26 2023 +0100
records.yaml - Rename few records that I missed in the original (#9897)
config to yaml conversion. Renamed local to config key.
- proxy.local.incoming_ip_to_bind -> proxy.config.
- proxy.local.outgoing_ip_to_bind -> proxy.config.
- proxy.local.http.parent_proxy.disable_connect_tunneling -> proxy.config.
---
doc/admin-guide/files/records.yaml.en.rst | 46 +++++++++++++++++++------------
proxy/http/HttpConfig.cc | 6 ++--
src/records/RecordsConfig.cc | 6 ++--
3 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/doc/admin-guide/files/records.yaml.en.rst
b/doc/admin-guide/files/records.yaml.en.rst
index a89430217d..ed5901c4d1 100644
--- a/doc/admin-guide/files/records.yaml.en.rst
+++ b/doc/admin-guide/files/records.yaml.en.rst
@@ -535,7 +535,7 @@ Network
with a lot of concurrent connections, increasing this setting can reduce
pressure on the system.
-.. ts:cv:: LOCAL proxy.local.incoming_ip_to_bind STRING 0.0.0.0 [::]
+.. ts:cv:: CONFIG proxy.config.incoming_ip_to_bind STRING 0.0.0.0 [::]
Controls the global default IP addresses to which to bind proxy server
ports. The value is a space separated list of IP addresses, one per
@@ -555,18 +555,24 @@ Network
.. topic:: Example
Set the global default for IPv4 to ``192.168.101.18`` and leave the global
- default for IPv6 as any address::
+ default for IPv6 as any address
- LOCAL proxy.local.incoming_ip_to_bind STRING 192.168.101.18
+ .. code-block:: yaml
+
+ ts:
+ incoming_ip_to_bind: 192.168.101.18
.. topic:: Example
Set the global default for IPv4 to ``191.68.101.18`` and the global default
- for IPv6 to ``fc07:192:168:101::17``::
+ for IPv6 to ``fc07:192:168:101::17``
- LOCAL proxy.local.incoming_ip_to_bind STRING 192.168.101.18
[fc07:192:168:101::17]
+ .. code-block:: yaml
+
+ ts:
+ incoming_ip_to_bind: "192.168.101.18 [fc07:192:168:101::17]"
-.. ts:cv:: LOCAL proxy.local.outgoing_ip_to_bind STRING 0.0.0.0 [::]
+.. ts:cv:: CONFIG proxy.config.outgoing_ip_to_bind STRING 0.0.0.0 [::]
This controls the global default for the local IP address for outbound
connections to origin servers. The value is a list of space separated IP
@@ -583,15 +589,21 @@ Network
.. topic:: Example
- Set the default local outbound IP address for IPv4 connections to
``192.168.101.18``.::
+ Set the default local outbound IP address for IPv4 connections to
``192.168.101.18``.
- LOCAL proxy.local.outgoing_ip_to_bind STRING 192.168.101.18
+ .. code-block:: yaml
+
+ ts:
+ outgoing_ip_to_bind: 192.168.101.18
.. topic:: Example
- Set the default local outbound IP address to ``192.168.101.17`` for IPv4
and ``fc07:192:168:101::17`` for IPv6.::
+ Set the default local outbound IP address to ``192.168.101.17`` for IPv4
and ``fc07:192:168:101::17`` for IPv6.
- LOCAL proxy.local.outgoing_ip_to_bind STRING 192.168.101.17
[fc07:192:168:101::17]
+ .. code-block:: yaml
+
+ ts:
+ outgoing_ip_to_bind: "192.168.101.17 [fc07:192:168:101::17]"
.. ts:cv:: CONFIG proxy.config.net.event_period INT 10
@@ -749,12 +761,12 @@ tr-full
Not compatible with: Any option not compatible with ``tr-in`` or ``tr-out``.
tr-in
- Inbound transparent. The proxy port will accept connections to any IP
address on the port. To have IPv6 inbound transparent you must use this and the
``ipv6`` option. This overrides :ts:cv:`proxy.local.incoming_ip_to_bind` for
this port.
+ Inbound transparent. The proxy port will accept connections to any IP
address on the port. To have IPv6 inbound transparent you must use this and the
``ipv6`` option. This overrides :ts:cv:`proxy.config.incoming_ip_to_bind` for
this port.
Not compatible with: ``ip-in``, ``blind``
tr-out
- Outbound transparent. If ATS connects to an origin server for a transaction
on this port, it will use the client's address as its local address. This
overrides :ts:cv:`proxy.local.outgoing_ip_to_bind` for this port.
+ Outbound transparent. If ATS connects to an origin server for a transaction
on this port, it will use the client's address as its local address. This
overrides :ts:cv:`proxy.config.outgoing_ip_to_bind` for this port.
Not compatible with: ``ip-out``, ``ip-resolve``
@@ -762,12 +774,12 @@ tr-pass
Transparent pass through. This option is useful only for inbound
transparent proxy ports. If the parsing of the expected HTTP header fails, then
the transaction is switched to a blind tunnel instead of generating an error
response to the client. It effectively enables
:ts:cv:`proxy.config.http.use_client_target_addr` for the transaction as there
is no other place to obtain the origin server address.
ip-in
- Set the local IP address for the port. This is the address to which clients
will connect. This forces the IP address family for the port. The ``ipv4`` or
``ipv6`` can be used but it is optional and is an error for it to disagree with
the IP address family of this value. An IPv6 address **must** be enclosed in
square brackets. If this option is omitted
:ts:cv:`proxy.local.incoming_ip_to_bind` is used.
+ Set the local IP address for the port. This is the address to which clients
will connect. This forces the IP address family for the port. The ``ipv4`` or
``ipv6`` can be used but it is optional and is an error for it to disagree with
the IP address family of this value. An IPv6 address **must** be enclosed in
square brackets. If this option is omitted
:ts:cv:`proxy.config.incoming_ip_to_bind` is used.
Not compatible with: ``tr-in``.
ip-out
- Set the local IP address for outbound connections. This is the address used
by ATS locally when it connects to an origin server for transactions on this
port. If this is omitted :ts:cv:`proxy.local.outgoing_ip_to_bind` is used.
+ Set the local IP address for outbound connections. This is the address used
by ATS locally when it connects to an origin server for transactions on this
port. If this is omitted :ts:cv:`proxy.config.outgoing_ip_to_bind` is used.
This option can used multiple times, once for each IP address family. The
address used is selected by the IP address family of the origin server address.
@@ -799,7 +811,7 @@ mptcp
.. topic:: Example
- Listen on port 8080 for IPv6, fully transparent. Set up an SSL port on 443.
These ports will use the IP address from
:ts:cv:`proxy.local.incoming_ip_to_bind`. Listen on IP address
``192.168.17.1``, port 80, IPv4, and connect to origin servers using the local
address ``10.10.10.1`` for IPv4 and ``fc01:10:10:1::1`` for IPv6.::
+ Listen on port 8080 for IPv6, fully transparent. Set up an SSL port on 443.
These ports will use the IP address from
:ts:cv:`proxy.config.incoming_ip_to_bind`. Listen on IP address
``192.168.17.1``, port 80, IPv4, and connect to origin servers using the local
address ``10.10.10.1`` for IPv4 and ``fc01:10:10:1::1`` for IPv6.::
8080:ipv6:tr-full 443:ssl
ip-in=192.168.17.1:80:ip-out=[fc01:10:10:1::1]:ip-out=10.10.10.1
@@ -843,7 +855,7 @@ mptcp
CONNECT method to the next hop, and establishes the tunnel after
receiving a positive response. This behavior is useful in a proxy
hierarchy, and is equivalent to setting
- :ts:cv:`proxy.local.http.parent_proxy.disable_connect_tunneling` to
+ :ts:cv:`proxy.config.http.parent_proxy.disable_connect_tunneling` to
`0` when parent proxying is enabled.
.. ts:cv:: CONFIG proxy.config.http.insert_request_via_str INT 1
@@ -1359,7 +1371,7 @@ Parent Proxy Configuration
Don't try to resolve DNS, forward all DNS requests to the parent. This is
off (``0``) by default.
-.. ts:cv:: CONFIG proxy.local.http.parent_proxy.disable_connect_tunneling INT 0
+.. ts:cv:: CONFIG proxy.config.http.parent_proxy.disable_connect_tunneling INT 0
.. ts:cv:: CONFIG proxy.config.http.parent_proxy.self_detect INT 2
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 8b167c13d4..2664caf03d 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -1159,8 +1159,8 @@ HttpConfig::startup()
c.proxy_hostname[0] = '\0';
}
- c.inbound += RecHttpLoadIp("proxy.local.incoming_ip_to_bind");
- c.outbound += RecHttpLoadIp("proxy.local.outgoing_ip_to_bind");
+ c.inbound += RecHttpLoadIp("proxy.config.incoming_ip_to_bind");
+ c.outbound += RecHttpLoadIp("proxy.config.outgoing_ip_to_bind");
RecHttpLoadIpAddrsFromConfVar("proxy.config.http.proxy_protocol_allowlist",
c.config_proxy_protocol_ip_addrs);
SSLConfigInit(&c.config_proxy_protocol_ip_addrs);
@@ -1176,7 +1176,7 @@ HttpConfig::startup()
HttpEstablishStaticConfigLongLong(c.http_request_line_max_size,
"proxy.config.http.request_line_max_size");
HttpEstablishStaticConfigLongLong(c.http_hdr_field_max_size,
"proxy.config.http.header_field_max_size");
- HttpEstablishStaticConfigByte(c.disable_ssl_parenting,
"proxy.local.http.parent_proxy.disable_connect_tunneling");
+ HttpEstablishStaticConfigByte(c.disable_ssl_parenting,
"proxy.config.http.parent_proxy.disable_connect_tunneling");
HttpEstablishStaticConfigByte(c.oride.forward_connect_method,
"proxy.config.http.forward_connect_method");
HttpEstablishStaticConfigByte(c.oride.no_dns_forward_to_parent,
"proxy.config.http.no_dns_just_forward_to_parent");
diff --git a/src/records/RecordsConfig.cc b/src/records/RecordsConfig.cc
index 2ce7f4be89..dc6b6a5d54 100644
--- a/src/records/RecordsConfig.cc
+++ b/src/records/RecordsConfig.cc
@@ -1290,7 +1290,7 @@ static const RecordElement RecordsConfig[] =
//# SSL requests from this proxy to a parent from
//# self-looping.
//#
- {RECT_LOCAL, "proxy.local.http.parent_proxy.disable_connect_tunneling",
RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
+ {RECT_LOCAL, "proxy.config.http.parent_proxy.disable_connect_tunneling",
RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http.forward_connect_method", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
@@ -1493,9 +1493,9 @@ static const RecordElement RecordsConfig[] =
,
//# Add LOCAL Records Here
- {RECT_LOCAL, "proxy.local.incoming_ip_to_bind", RECD_STRING, nullptr,
RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
+ {RECT_LOCAL, "proxy.config.incoming_ip_to_bind", RECD_STRING, nullptr,
RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
- {RECT_LOCAL, "proxy.local.outgoing_ip_to_bind", RECD_STRING, nullptr,
RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
+ {RECT_LOCAL, "proxy.config.outgoing_ip_to_bind", RECD_STRING, nullptr,
RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
//# Librecords based stats system (new as of v2.1.3)
