Skip to content

Commit

Permalink
docs: ORY -> Ory to follow styleguides (#2941)
Browse files Browse the repository at this point in the history
  • Loading branch information
gen1us2k authored Jan 18, 2022
1 parent 844a595 commit 5895d03
Show file tree
Hide file tree
Showing 18 changed files with 158 additions and 158 deletions.
90 changes: 45 additions & 45 deletions CHANGELOG.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cypress/integration/oauth2/authorize_error.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ describe('OAuth 2.0 Authorization Endpoint Error Handling', () => {
const query = qs.parse(search.substr(1))
expect(query.error).to.equal('invalid_client')

// Should show ORY Hydra's Error URL because a redirect URL could not be determined
// Should show Ory Hydra's Error URL because a redirect URL could not be determined
expect(port).to.equal(Cypress.env('public_port'))
})
})
Expand Down Expand Up @@ -173,7 +173,7 @@ describe('OAuth 2.0 Authorization Endpoint Error Handling', () => {
expect(query.error).to.equal('invalid_request')
expect(query.error_description).to.contain('redirect_uri')

// Should show ORY Hydra's Error URL because a redirect URL could not be determined
// Should show Ory Hydra's Error URL because a redirect URL could not be determined
expect(port).to.equal(Cypress.env('public_port'))
})
})
Expand Down
44 changes: 22 additions & 22 deletions docs/docs/.static/api.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion driver/config/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ func (p *Provider) ScopeStrategy() string {
}

func (p *Provider) Tracing() *tracing.Config {
return p.p.TracingConfig("ORY Hydra")
return p.p.TracingConfig("Ory Hydra")
}

func (p *Provider) GetCookieSecrets() [][]byte {
Expand Down
2 changes: 1 addition & 1 deletion driver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func New(ctx context.Context, opts ...OptionsModifier) Registry {
f(o)
}

l := logrusx.New("ORY Hydra", config.Version)
l := logrusx.New("Ory Hydra", config.Version)
c, err := config.New(l, o.opts...)
if err != nil {
l.WithError(err).Fatal("Unable to instantiate configuration.")
Expand Down
4 changes: 2 additions & 2 deletions driver/registry_base.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@ func (m *RegistryBase) WithLogger(l *logrusx.Logger) Registry {

func (m *RegistryBase) Logger() *logrusx.Logger {
if m.l == nil {
m.l = logrusx.New("ORY Hydra", m.BuildVersion())
m.l = logrusx.New("Ory Hydra", m.BuildVersion())
}
return m.l
}

func (m *RegistryBase) AuditLogger() *logrusx.Logger {
if m.al == nil {
m.al = logrusx.NewAudit("ORY Hydra", m.BuildVersion())
m.al = logrusx.NewAudit("Ory Hydra", m.BuildVersion())
}
return m.al
}
Expand Down
22 changes: 11 additions & 11 deletions internal/config/config.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# ORY Hydra Configuration
# Ory Hydra Configuration
#
#
# !!WARNING!!
# This configuration file is for documentation purposes only. Do not use it in production. As all configuration items
# are enabled, it will not work out of the box either.
#
#
# ORY Hydra can be configured using a configuration file and passing the file location using `--config path/to/config.yaml`.
# Per default, ORY Hydra will look up and load file ~/.hydra.yaml. All configuration keys can be set using environment
# Ory Hydra can be configured using a configuration file and passing the file location using `--config path/to/config.yaml`.
# Per default, Ory Hydra will look up and load file ~/.hydra.yaml. All configuration keys can be set using environment
# variables as well.
#
# Setting environment variables is easy:
Expand Down Expand Up @@ -86,7 +86,7 @@ serve:
public:
# The port to listen on. Defaults to 4444
port: 4444
# The interface or unix socket ORY Hydra should listen and handle public API requests on.
# The interface or unix socket Ory Hydra should listen and handle public API requests on.
# Use the prefix "unix:" to specify a path to a unix socket.
# Leave empty to listen on all interfaces.
host: localhost # leave this out or empty to listen on all devices which is the default
Expand Down Expand Up @@ -146,7 +146,7 @@ serve:
admin:
# The port to listen on. Defaults to 4445
port: 4445
# The interface or unix socket ORY Hydra should listen and handle administrative API requests on.
# The interface or unix socket Ory Hydra should listen and handle administrative API requests on.
# Use the prefix "unix:" to specify a path to a unix socket.
# Leave empty to listen on all interfaces.
host: localhost # leave this out or empty to listen on all devices which is the default
Expand Down Expand Up @@ -236,7 +236,7 @@ serve:
# without SameSite as a fallback.
same_site_legacy_workaround: false

# dsn sets the data source name. This configures the backend where ORY Hydra persists data.
# dsn sets the data source name. This configures the backend where Ory Hydra persists data.
#
## In-memory database
#
Expand All @@ -245,7 +245,7 @@ serve:
#
## SQL databases
#
# ORY Hydra supports popular SQL databases. For more detailed configuration information go to:
# Ory Hydra supports popular SQL databases. For more detailed configuration information go to:
# https://www.ory.sh/docs/hydra/dependencies-environment#sql
#
### PostgreSQL (recommended)
Expand Down Expand Up @@ -300,7 +300,7 @@ webfinger:
- read.photos

# A URL of the userinfo endpoint to be advertised at the OpenID Connect
# Discovery endpoint /.well-known/openid-configuration. Defaults to ORY Hydra's userinfo endpoint at /userinfo.
# Discovery endpoint /.well-known/openid-configuration. Defaults to Ory Hydra's userinfo endpoint at /userinfo.
# Set this value if you want to handle this endpoint yourself.
userinfo_url: https://example.org/my-custom-userinfo-endpoint

Expand Down Expand Up @@ -341,7 +341,7 @@ urls:
# to the public value.
issuer: https://localhost:4444/

# This is the base location of the public endpoints of your ORY Hydra installation. This should typically be equal
# This is the base location of the public endpoints of your Ory Hydra installation. This should typically be equal
# to the issuer value. If left unspecified, it falls back to the issuer value.
public: https://localhost:4444/

Expand Down Expand Up @@ -429,13 +429,13 @@ secrets:
profiling: cpu
# profiling: mem

# ORY Hydra supports distributed tracing.
# Ory Hydra supports distributed tracing.
tracing:
# Set this to the tracing backend you wish to use. Currently supports jaeger. If omitted or empty, tracing will
# be disabled.
provider: jaeger
# Specifies the service name to use on the tracer.
service_name: ORY Hydra
service_name: Ory Hydra
providers:
# Configures the jaeger tracing backend.
jaeger:
Expand Down
Loading

0 comments on commit 5895d03

Please sign in to comment.