git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge branch 'master' of github.com:pusher/oauth2_proxy into support-x-auth-request-redirect
commit8098094fc2c7a559d2504a5415edfaad9082edfc authorIan Hunter <ian@ianhunter.me> dateThu 19 Sep 2019, 11:27 (7 years ago) parent18a77e682a3d5a
2 files changed+7−5
docs/Gemfile.lock+1−1 docs/configuration/configuration.md+6−4
docs/Gemfile.lock+1−1
@@ -208,7 +208,7 @@ GEM
208208 jekyll-seo-tag (~> 2.1)
209209 minitest (5.11.3)
210210 multipart-post (2.0.0)
211− nokogiri (1.10.1)
211+ nokogiri (1.10.4)
212212 mini_portile2 (~> 2.4.0)
213213 octokit (4.13.0)
214214 sawyer (~> 0.8.0, >= 0.5.3)
docs/configuration/configuration.md+6−4
@@ -126,12 +126,14 @@ Multiple upstreams can either be configured by supplying a comma separated list
126126
127127Every command line argument can be specified as an environment variable by
128128prefixing it with `OAUTH2_PROXY_`, capitalising it, and replacing hypens (`-`)
129−with underscores (`_`). This is particularly useful for storing secrets outside
130−of a configuration file or the command line.
129+with underscores (`_`). If the argument can be specified multiple times, the
130+environment variable should be plural (trailing `S`).
131131
132−For example, the `--cookie-secret` flag becomes `OAUTH2_PROXY_COOKIE_SECRET` and
133−the `--set-authorization-header` flag becomes `OAUTH2_PROXY_SET_AUTHORIZATION_HEADER`.
132+This is particularly useful for storing secrets outside of a configuration file
133+or the command line.
134134
135+For example, the `--cookie-secret` flag becomes `OAUTH2_PROXY_COOKIE_SECRET`,
136+and the `--email-domain` flag becomes `OAUTH2_PROXY_EMAIL_DOMAINS`.
135137
136138## Logging Configuration
137139