Merge pull request #213 from pusher/fix-tls-flags
Correct TLS Flags broken in #186
This commit is contained in:
		
						commit
						7bf00b7f4a
					
				|  | @ -9,7 +9,7 @@ nav_order: 4 | ||||||
| 
 | 
 | ||||||
| There are two recommended configurations. | There are two recommended configurations. | ||||||
| 
 | 
 | ||||||
| 1.  Configure SSL Termination with OAuth2 Proxy by providing a `--tls-cert=/path/to/cert.pem` and `--tls-key=/path/to/cert.key`. | 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`. | ||||||
| 
 | 
 | ||||||
| The command line to run `oauth2_proxy` in this configuration would look like this: | The command line to run `oauth2_proxy` in this configuration would look like this: | ||||||
| 
 | 
 | ||||||
|  | @ -17,8 +17,8 @@ The command line to run `oauth2_proxy` in this configuration would look like thi | ||||||
| ./oauth2_proxy \ | ./oauth2_proxy \ | ||||||
|    --email-domain="yourcompany.com"  \ |    --email-domain="yourcompany.com"  \ | ||||||
|    --upstream=http://127.0.0.1:8080/ \ |    --upstream=http://127.0.0.1:8080/ \ | ||||||
|    --tls-cert=/path/to/cert.pem \ |    --tls-cert-file=/path/to/cert.pem \ | ||||||
|    --tls-key=/path/to/cert.key \ |    --tls-key-file=/path/to/cert.key \ | ||||||
|    --cookie-secret=... \ |    --cookie-secret=... \ | ||||||
|    --cookie-secure=true \ |    --cookie-secure=true \ | ||||||
|    --provider=... \ |    --provider=... \ | ||||||
|  |  | ||||||
|  | @ -98,8 +98,8 @@ Usage of oauth2_proxy: | ||||||
|   -ssl-insecure-skip-verify: skip validation of certificates presented when using HTTPS |   -ssl-insecure-skip-verify: skip validation of certificates presented when using HTTPS | ||||||
|   -standard-logging: Log standard runtime information (default true) |   -standard-logging: Log standard runtime information (default true) | ||||||
|   -standard-logging-format string: Template for standard log lines (see "Logging Configuration" paragraph below) |   -standard-logging-format string: Template for standard log lines (see "Logging Configuration" paragraph below) | ||||||
|   -tls-cert string: path to certificate file |   -tls-cert-file string: path to certificate file | ||||||
|   -tls-key string: path to private key file |   -tls-key-file string: path to private key file | ||||||
|   -upstream value: the http url(s) of the upstream endpoint or file:// paths for static files. Routing is based on the path |   -upstream value: the http url(s) of the upstream endpoint or file:// paths for static files. Routing is based on the path | ||||||
|   -validate-url string: Access token validation endpoint |   -validate-url string: Access token validation endpoint | ||||||
|   -version: print version string |   -version: print version string | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								main.go
								
								
								
								
							
							
						
						
									
										4
									
								
								main.go
								
								
								
								
							|  | @ -32,8 +32,8 @@ func main() { | ||||||
| 
 | 
 | ||||||
| 	flagSet.String("http-address", "127.0.0.1:4180", "[http://]<addr>:<port> or unix://<path> to listen on for HTTP clients") | 	flagSet.String("http-address", "127.0.0.1:4180", "[http://]<addr>:<port> or unix://<path> to listen on for HTTP clients") | ||||||
| 	flagSet.String("https-address", ":443", "<addr>:<port> to listen on for HTTPS clients") | 	flagSet.String("https-address", ":443", "<addr>:<port> to listen on for HTTPS clients") | ||||||
| 	flagSet.String("tls-cert", "", "path to certificate file") | 	flagSet.String("tls-cert-file", "", "path to certificate file") | ||||||
| 	flagSet.String("tls-key", "", "path to private key file") | 	flagSet.String("tls-key-file", "", "path to private key file") | ||||||
| 	flagSet.String("redirect-url", "", "the OAuth Redirect URL. ie: \"https://internalapp.yourcompany.com/oauth2/callback\"") | 	flagSet.String("redirect-url", "", "the OAuth Redirect URL. ie: \"https://internalapp.yourcompany.com/oauth2/callback\"") | ||||||
| 	flagSet.Bool("set-xauthrequest", false, "set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode)") | 	flagSet.Bool("set-xauthrequest", false, "set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode)") | ||||||
| 	flagSet.Var(&upstreams, "upstream", "the http url(s) of the upstream endpoint or file:// paths for static files. Routing is based on the path") | 	flagSet.Var(&upstreams, "upstream", "the http url(s) of the upstream endpoint or file:// paths for static files. Routing is based on the path") | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue