Skip to content

Commit

Permalink
unstaged
Browse files Browse the repository at this point in the history
  • Loading branch information
arekkas committed Dec 4, 2017
1 parent 5210a09 commit e5ff543
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ This list makes you aware of any breaking and substantial non-breaking changes.

## 0.10.0-alpha.22

### Additions

### Breaking changes

The JWK algorithm `ES521` was renamed to `ES512`. If you want to generate a key using this algorithm, you have to use
the update name in the future.

Expand Down
4 changes: 4 additions & 0 deletions cmd/host.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ CORE CONTROLS
visit https://ory.gitbooks.io/hydra/content/telemetry.html
Example: DISABLE_TELEMETRY="1"
- RESOURCE_NAME_PREFIX: Allows the alternation of the "rn:hydra:" prefix in all resource names declared by ORY Hydra.
Defaults to "rn:hydra" if empty and removes the last trailing colon.
Example: RESOURCE_NAME_PREFIX="resources:my-domain.com"
OAUTH2 CONTROLS
===============
Expand Down
4 changes: 2 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ func initConfig() {
viper.BindEnv("LOG_FORMAT")
viper.SetDefault("LOG_FORMAT", "")

viper.BindEnv("AC_RESOURCE_PREFIX")
viper.SetDefault("AC_RESOURCE_PREFIX", "")
viper.BindEnv("RESOURCE_NAME_PREFIX")
viper.SetDefault("RESOURCE_NAME_PREFIX", "")

// If a config file is found, read it in.
if err := viper.ReadInConfig(); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ type Config struct {
CookieSecret string `mapstructure:"COOKIE_SECRET" yaml:"-"`
LogLevel string `mapstructure:"LOG_LEVEL" yaml:"-"`
LogFormat string `mapstructure:"LOG_FORMAT" yaml:"-"`
AccessControlResourcePrefix string `mapstructure:"AC_RESOURCE_PREFIX" yaml:"-"`
AccessControlResourcePrefix string `mapstructure:"RESOURCE_NAME_PREFIX" yaml:"-"`
ForceHTTP bool `yaml:"-"`

BuildVersion string `yaml:"-"`
Expand Down

0 comments on commit e5ff543

Please sign in to comment.