Merge: + allow_unencrypted_doh

* commit 'df36e3093da91c64b695fcfaaa7a0a92b4d20825':
  + allow_unencrypted_doh
Andrey Meshkov 2019-12-20 15:14:00 +03:00
commit 0558e8e598

@ -175,6 +175,7 @@ Settings are stored in [YAML format](https://en.wikipedia.org/wiki/YAML), possib
* `force_https` - if true, forces HTTP->HTTPS redirect.
* `port_https` - HTTPS port. If 0, HTTPS will be disabled.
* `port_dns_over_tls` - DNS-over-TLS port. If 0, DOT will be disabled.
* `allow_unencrypted_doh` - Allow DOH queries via unencrypted HTTP (e.g. for reverse proxying)
* `certificate_chain` - PEM-encoded certificates chain.
* `private_key` - PEM-encoded private key.
* `icmp_timeout_msec` - time (ms) to wait for ICMP reply to detect an IP conflict. If 0, the feature is disabled.