trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [trafficserver] branch master updated: IPAllow: change top level key to "ip_allow".
Date Wed, 07 Aug 2019 21:33:13 GMT
This is an automated email from the ASF dual-hosted git repository.

amc 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 37df8d9  IPAllow: change top level key to "ip_allow".
37df8d9 is described below

commit 37df8d963dac457437f584a9e62812fc39298999
Author: Alan M. Carroll <amc@apache.org>
AuthorDate: Mon Aug 5 13:13:19 2019 -0500

    IPAllow: change top level key to "ip_allow".
---
 configs/ip_allow.schema.json                       | 4 ++--
 configs/ip_allow.yaml.default                      | 4 ++--
 doc/admin-guide/files/ip_allow.config.en.rst       | 6 +++---
 proxy/IPAllow.h                                    | 2 +-
 tests/gold_tests/autest-site/min_cfg/ip_allow.yaml | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configs/ip_allow.schema.json b/configs/ip_allow.schema.json
index ba495b6..6c9a885 100644
--- a/configs/ip_allow.schema.json
+++ b/configs/ip_allow.schema.json
@@ -8,7 +8,7 @@
       "type": "string",
       "description": "Configuration format version."
     },
-    "ip_addr_acl": {
+    "ip_allow": {
       "description": "Root tag for IP address ACL configuration",
       "type": "array",
       "items": {
@@ -16,7 +16,7 @@
       }
     }
   },
-  "required": [ "ip_addr_acl" ],
+  "required": [ "ip_allow" ],
   "definitions": {
     "range": {
       "description": "A range of IP addresses in a single family.",
diff --git a/configs/ip_allow.yaml.default b/configs/ip_allow.yaml.default
index 35b872b..f4d2233 100644
--- a/configs/ip_allow.yaml.default
+++ b/configs/ip_allow.yaml.default
@@ -18,14 +18,14 @@
 # A rule must have either "src" or "dst" to indicate if the IP addresses apply to inbound
connections
 # or outbound connections.
 #
-# The top level tag 'ip_addr_acl' identifies the rule items. Its value must be a rule item
or a
+# The top level tag 'ip_allow' identifies the rule items. Its value must be a rule item or
a
 # sequence of rule items.
 #
 # Rules are applied in the order listed starting from the top.
 # That means you generally want to append your rules after the ones listed here.
 #
 # Allow anything on localhost, limit destructive methods elsewhere.
-ip_addr_acl:
+ip_allow:
   - apply: in
     ip_addrs: 127.0.0.1
     action: allow
diff --git a/doc/admin-guide/files/ip_allow.config.en.rst b/doc/admin-guide/files/ip_allow.config.en.rst
index 185af87..c91c3af 100644
--- a/doc/admin-guide/files/ip_allow.config.en.rst
+++ b/doc/admin-guide/files/ip_allow.config.en.rst
@@ -42,7 +42,7 @@ Format
 :file:`ip_allow.yaml` is YAML format. The default configuration is::
 
    # YAML
-   ip_addr_acl:
+   ip_allow:
      - apply: in
        ip_addrs: 127.0.0.1
        action: allow
@@ -66,7 +66,7 @@ Format
          - PUSH
          - DELETE
 
-Each rule is a mapping. The YAML data must have a top level key of "ip_addr_acl" and its
value must
+Each rule is a mapping. The YAML data must have a top level key of "ip_allow" and its value
must
 be a mapping or a sequence of mappings, each of those being one rule.
 
 The keys in a rule are
@@ -210,7 +210,7 @@ denied.
 
 As a final example, here is the default configuration in compact form::
 
-   ip_addr_acl: [
+   ip_allow: [
      { apply: in, ip_addrs: 127.0.0.1, action: allow },
      { apply: in, ip_addrs: "::1", action: allow },
      { apply: in, ip_addrs: 0/0, action: deny, methods: [ PURGE, PUSH, DELETE ] },
diff --git a/proxy/IPAllow.h b/proxy/IPAllow.h
index a7dbb88..5656a5c 100644
--- a/proxy/IPAllow.h
+++ b/proxy/IPAllow.h
@@ -89,7 +89,7 @@ public:
   static constexpr ts::TextView OPT_METHOD{"method"};
   static constexpr ts::TextView OPT_METHOD_ALL{"all"};
 
-  static constexpr ts::TextView YAML_TAG_ROOT{"ip_addr_acl"};
+  static constexpr ts::TextView YAML_TAG_ROOT{"ip_allow"};
   static constexpr ts::TextView YAML_TAG_IP_ADDRS{"ip_addrs"};
   static constexpr ts::TextView YAML_TAG_APPLY{"apply"};
   static constexpr ts::TextView YAML_VALUE_APPLY_IN{"in"};
diff --git a/tests/gold_tests/autest-site/min_cfg/ip_allow.yaml b/tests/gold_tests/autest-site/min_cfg/ip_allow.yaml
index 9f80a0b..d13c275 100644
--- a/tests/gold_tests/autest-site/min_cfg/ip_allow.yaml
+++ b/tests/gold_tests/autest-site/min_cfg/ip_allow.yaml
@@ -14,7 +14,7 @@
 #  the License.
 
 # Allow anything on localhost, limit destructive methods elsewhere.
-ip_addr_acl:
+ip_allow:
   - apply: in
     ip_addrs: 127.0.0.1
     action: allow


Mime
View raw message