resolve code review

apache · Aug 18, 2022 · 39117aa · 39117aa
1 parent 989333e
commit 39117aa
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/apisix/cli/ngx_tpl.lua b/apisix/cli/ngx_tpl.lua
@@ -582,6 +582,9 @@ http {
         {% if proxy_protocol and proxy_protocol.listen_http_port then %}
         listen {* proxy_protocol.listen_http_port *} default_server proxy_protocol;
         {% end %}
+        {% if proxy_protocol and proxy_protocol.listen_https_port then %}
+        listen {* proxy_protocol.listen_https_port *} ssl default_server proxy_protocol;
+        {% end %}
 
         server_name _;
 

diff --git a/apisix/cli/schema.lua b/apisix/cli/schema.lua
@@ -208,6 +208,22 @@ local config_schema = {
                     properties = {
                         ssl_trusted_certificate = {
                             type = "string",
+                        },
+                        listen = {
+                            type = "object",
+                            properties = {
+                                ip = {
+                                    type = "string",
+                                },
+                                port = {
+                                    type = "integer",
+                                    minimum = 1,
+                                    maximum = 65535
+                                },
+                                enable_http2 = {
+                                    type = "boolean",
+                                }
+                            },
                         }
                     }
                 },

diff --git a/conf/config-default.yaml b/conf/config-default.yaml
@@ -135,8 +135,6 @@ apisix:
     listen:                       # APISIX listening port in https.
       - port: 9443
         enable_http2: true
-    #   - port: 9444
-    #     enable_http2: true      # If not set, the default value is `false`.
     #   - ip: 127.0.0.3           # Specific IP, If not set, the default value is `0.0.0.0`.
     #     port: 9445
     #     enable_http2: true