git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge pull request #213 from pusher/fix-tls-flags

Correct TLS Flags broken in #186

commit7bf00b7f4a4239e8a56675e8f8e6b04dd01e8515 authorJoel Speed <Joel.speed@hotmail.co.uk> dateWed 17 Jul 2019, 10:10 (7 years ago) parente952ab47b1132d
3 files changed+7−7
compare with master
unifiedsplit
docs/4_tls.md+3−3 docs/configuration/configuration.md+2−2 main.go+2−2
docs/4_tls.md+3−3
@@ -9,7 +9,7 @@ nav_order: 4
99
1010There are two recommended configurations.
1111
12−1. Configure SSL Termination with OAuth2 Proxy by providing a `--tls-cert=/path/to/cert.pem` and `--tls-key=/path/to/cert.key`.
12+1. Configure SSL Termination with OAuth2 Proxy by providing a `--tls-cert-file=/path/to/cert.pem` and `--tls-key-file=/path/to/cert.key`.
1313
1414The command line to run `oauth2_proxy` in this configuration would look like this:
1515
@@ -17,8 +17,8 @@ The command line to run `oauth2_proxy` in this configuration would look like thi
1717./oauth2_proxy \
1818 --email-domain="yourcompany.com" \
1919 --upstream=http://127.0.0.1:8080/ \
20− --tls-cert=/path/to/cert.pem \
21− --tls-key=/path/to/cert.key \
20+ --tls-cert-file=/path/to/cert.pem \
21+ --tls-key-file=/path/to/cert.key \
2222 --cookie-secret=... \
2323 --cookie-secure=true \
2424 --provider=... \
docs/configuration/configuration.md+2−2
@@ -98,8 +98,8 @@ Usage of oauth2_proxy:
9898 -ssl-insecure-skip-verify: skip validation of certificates presented when using HTTPS
9999 -standard-logging: Log standard runtime information (default true)
100100 -standard-logging-format string: Template for standard log lines (see "Logging Configuration" paragraph below)
101− -tls-cert string: path to certificate file
102− -tls-key string: path to private key file
101+ -tls-cert-file string: path to certificate file
102+ -tls-key-file string: path to private key file
103103 -upstream value: the http url(s) of the upstream endpoint or file:// paths for static files. Routing is based on the path
104104 -validate-url string: Access token validation endpoint
105105 -version: print version string
main.go+2−2
@@ -32,8 +32,8 @@ func main() {
3232
3333 flagSet.String("http-address", "127.0.0.1:4180", "[http://]<addr>:<port> or unix://<path> to listen on for HTTP clients")
3434 flagSet.String("https-address", ":443", "<addr>:<port> to listen on for HTTPS clients")
35− flagSet.String("tls-cert", "", "path to certificate file")
36− flagSet.String("tls-key", "", "path to private key file")
35+ flagSet.String("tls-cert-file", "", "path to certificate file")
36+ flagSet.String("tls-key-file", "", "path to private key file")
3737 flagSet.String("redirect-url", "", "the OAuth Redirect URL. ie: \"https://internalapp.yourcompany.com/oauth2/callback\"")
3838 flagSet.Bool("set-xauthrequest", false, "set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode)")
3939 flagSet.Var(&upstreams, "upstream", "the http url(s) of the upstream endpoint or file:// paths for static files. Routing is based on the path")