Merge branch 'master' into 1920-client-find

2020-09-15 10:45:32 +03:00
parent 2c12d5f860 9651243347
commit da1e235052
50 changed files with 1574 additions and 423 deletions
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -997,6 +997,8 @@ components:
                    example:
                        - tls://1.1.1.1
                        - tls://1.0.0.1
+                upstream_dns_file:
+                    type: string
                protection_enabled:
                    type: boolean
                dhcp_available:
@@ -1007,6 +1009,7 @@ components:
                    type: string
                    enum:
                        - default
+                        - refused
                        - nxdomain
                        - null_ip
                        - custom_ip
@@ -1563,6 +1566,11 @@ components:
                    format: int32
                    example: 853
                    description: DNS-over-TLS port. If 0, DOT will be disabled.
+                port_dns_over_quic:
+                    type: integer
+                    format: int32
+                    example: 784
+                    description: DNS-over-QUIC port. If 0, DOQ will be disabled.
                certificate_chain:
                    type: string
                    description: Base64 string with PEM-encoded certificates chain