kayx23 commented on code in PR #9611:
URL: https://github.com/apache/apisix/pull/9611#discussion_r1222637118


##########
conf/config-default.yaml:
##########
@@ -14,36 +14,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# PLEASE DO NOT UPDATE THIS FILE!
-# If you want to set the specified configuration value, you can set the new
-# value in the conf/config.yaml file.
+# CAUTION: DO NOT MODIFY DEFAULT CONFIGURATIONS IN THIS FILE
+# You should keep custom configurations in conf/config.yaml.
 #
 
 apisix:
-  # node_listen: 9080               # APISIX listening port
-  node_listen:                      # This style support multiple ports
+  # node_listen: 9080               # Use this if APISIX listens on a single 
port.
+  node_listen:                      # Use this if APISIX listens on multiple 
ports.
     - 9080
   #   - port: 9081
-  #     enable_http2: true          # If not set, the default value is `false`.
-  #   - ip: 127.0.0.2               # Specific IP, If not set, the default 
value is `0.0.0.0`.
+  #     enable_http2: true          # If not set, default to `false`.
+  #   - ip: 127.0.0.2               # If not set, default to `0.0.0.0`/
   #     port: 9082
   #     enable_http2: true
   enable_admin: true
-  enable_dev_mode: false            # Sets nginx worker_processes to 1 if set 
to true
-  enable_reuseport: true            # Enable nginx SO_REUSEPORT switch if set 
to true.
-  show_upstream_status_in_response_header: false # when true all upstream 
status write to `X-APISIX-Upstream-Status` otherwise only 5xx code
+  enable_dev_mode: false            # If true, nginx worker_processes will be 
set to 1.
+  enable_reuseport: true            # If true, nginx SO_REUSEPORT option will 
be enabled.
+  show_upstream_status_in_response_header: false  # If true, include the 
upstream HTTP status code in
+                                                  # the response header 
`X-APISIX-Upstream-Status`.
+                                                  # If false, show 
`X-APISIX-Upstream-Status` only if
+                                                  # the upstream response code 
is 5xx.
   enable_ipv6: true
-
-  #proxy_protocol:                  # Proxy Protocol configuration
-  #  listen_http_port: 9181         # The port with proxy protocol for http, 
it differs from node_listen and admin_listen.
-                                    # This port can only receive http request 
with proxy protocol, but node_listen & admin_listen
-                                    # can only receive http request. If you 
enable proxy protocol, you must use this port to
-                                    # receive http request with proxy protocol
-  #  listen_https_port: 9182        # The port with proxy protocol for https
-  #  enable_tcp_pp: true            # Enable the proxy protocol for tcp proxy, 
it works for stream_proxy.tcp option
-  #  enable_tcp_pp_to_upstream: true # Enables the proxy protocol to the 
upstream server

Review Comment:
   why is `enable_tcp_pp_to_upstream` needed
   
   ```
           {% if proxy_protocol and proxy_protocol.enable_tcp_pp_to_upstream 
then %}
           proxy_protocol on;
           {% end %}
   ```
   https://github.com/apache/apisix/issues/9626



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to