Merge remote-tracking branch 'origin/master' into feature/envoy

This commit is contained in:
Caleb Doxsey 2020-05-08 11:17:30 -06:00 committed by Travis Groth
parent 99e788a9b4
commit 02615b8b6c
48 changed files with 1283 additions and 561 deletions

View file

@ -11,8 +11,17 @@ type ServerOptions struct {
// HTTPS requests. If empty, ":443" is used.
Addr string
// TLS certificates to use.
TLSCertificate *tls.Certificate
// TLSConfig is the tls configuration used to setup the HTTPS server.
TLSConfig *tls.Config
// InsecureServer when enabled disables all transport security.
// In this mode, Pomerium is susceptible to man-in-the-middle attacks.
// This should be used only for testing.
Insecure bool
// Service is an optional field that helps define what the server's role is.
Service string
// Timeouts
ReadHeaderTimeout time.Duration
ReadTimeout time.Duration