Skip to content

Commit

Permalink
Merge branch 'master' into modify_introspection_response
Browse files Browse the repository at this point in the history
  • Loading branch information
tjandrayana authored Jul 24, 2021
2 parents 5022229 + a0a1329 commit 03d71d9
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 21 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

**Table of Contents**

- [Unreleased (2021-07-19)](#unreleased-2021-07-19)
- [Unreleased (2021-07-23)](#unreleased-2021-07-23)
- [Bug Fixes](#bug-fixes)
- [Features](#features)
- [0.38.14-beta.1 (2021-07-14)](#03814-beta1-2021-07-14)
Expand Down Expand Up @@ -242,7 +242,7 @@

<!-- END doctoc generated TOC please keep comment here to allow auto update -->

# [Unreleased](https://github.com/ory/oathkeeper/compare/v0.38.14-beta.1...1f6c4306c3ec0e860b6606e06133c1f2a796c8e1) (2021-07-19)
# [Unreleased](https://github.com/ory/oathkeeper/compare/v0.38.14-beta.1...1f6c4306c3ec0e860b6606e06133c1f2a796c8e1) (2021-07-23)

### Bug Fixes

Expand Down
96 changes: 77 additions & 19 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions docs/scripts/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,15 @@ flag: \`${config.projectSlug} --config path/to/config.yaml\`.
Config files can be formatted as JSON, YAML and TOML. Some configuration values support reloading without server restart.
All configuration values can be set using environment variables, as documented below.
:::warning Disclaimer
This reference configuration documents all keys, also deprecated ones!
It is a reference for all possible configuration values.
If you are looking for an example configuration, it is better to try out the quickstart.
:::
To find out more about edge cases like setting string array values through environmental variables head to the
[Configuring ORY services](https://www.ory.sh/docs/ecosystem/configuring) section.
Expand Down

0 comments on commit 03d71d9

Please sign in to comment.