public_git
/
oauth2-proxy
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into keycloak-provider

This commit is contained in:
Dan Bond 2019-09-25 13:21:46 -07:00 committed by GitHub
parent 71dfd44149 82a3d5afdc
commit 85a1ed5135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Gemfile.lock
View File

@ -208,7 +208,7 @@ GEM
jekyll-seo-tag (~> 2.1) jekyll-seo-tag (~> 2.1)
minitest (5.11.3) minitest (5.11.3)
multipart-post (2.0.0) multipart-post (2.0.0)
nokogiri (1.10.1) nokogiri (1.10.4)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
octokit (4.13.0) octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3) sawyer (~> 0.8.0, >= 0.5.3)

10
docs/configuration/configuration.md
View File

@ -126,12 +126,14 @@ Multiple upstreams can either be configured by supplying a comma separated list
Every command line argument can be specified as an environment variable by Every command line argument can be specified as an environment variable by
prefixing it with `OAUTH2_PROXY_`, capitalising it, and replacing hypens (`-`) prefixing it with `OAUTH2_PROXY_`, capitalising it, and replacing hypens (`-`)
with underscores (`_`). This is particularly useful for storing secrets outside with underscores (`_`). If the argument can be specified multiple times, the
of a configuration file or the command line. environment variable should be plural (trailing `S`).
For example, the `--cookie-secret` flag becomes `OAUTH2_PROXY_COOKIE_SECRET` and This is particularly useful for storing secrets outside of a configuration file
the `--set-authorization-header` flag becomes `OAUTH2_PROXY_SET_AUTHORIZATION_HEADER`. or the command line.
For example, the `--cookie-secret` flag becomes `OAUTH2_PROXY_COOKIE_SECRET`,
and the `--email-domain` flag becomes `OAUTH2_PROXY_EMAIL_DOMAINS`.
## Logging Configuration ## Logging Configuration