Skip to content
This repository was archived by the owner on Feb 4, 2021. It is now read-only.

Fix hydra cors settings #174

Merged
merged 1 commit into from
Nov 5, 2019
Merged

Fix hydra cors settings #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ HYDRA_SALT=youReallyNeedToChangeThis
OAUTH2_ISSUER_URL=http://localhost:4444
OAUTH2_CONSENT_URL=http://localhost:8080/oauth/consent
OAUTH2_LOGIN_URL=http://localhost:8080/oauth/login
CORS_ALLOWED_ORIGINS=http://127.0.0.1:*,http://localhost:*,https://*.prolab.club,https://prolab.club

# for ridgepole
DATABASE_URL_RIDGEPOLE=postgresql://postgres:@pg/accounts?sslmode=disable
Expand Down
1 change: 1 addition & 0 deletions .env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ HYDRA_SALT=youReallyNeedToChangeThis
OAUTH2_ISSUER_URL=http://localhost:4444
OAUTH2_CONSENT_URL=http://localhost:8080/oauth/consent
OAUTH2_LOGIN_URL=http://localhost:8080/oauth/login
CORS_ALLOWED_ORIGINS=http://127.0.0.1:*,http://localhost:*,https://*.prolab.club,https://prolab.club

# for ridgepole
DATABASE_URL_RIDGEPOLE=postgresql://postgres:@pg/accounts?sslmode=disable
Expand Down
9 changes: 2 additions & 7 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,8 @@ services:
- OAUTH2_SHARE_ERROR_DEBUG=1
- OIDC_SUBJECT_TYPES_SUPPORTED=public,pairwise
- OIDC_SUBJECT_TYPE_PAIRWISE_SALT=${HYDRA_SALT}
# - OAUTH2_ACCESS_TOKEN_STRATEGY=jwt
# Uncomment the following lines when configuring tracing
# - TRACING_PROVIDER=jaeger
# - TRACING_PROVIDER_JAEGER_SAMPLING_SERVER_URL=http://jaeger:5778/sampling
# - TRACING_PROVIDER_JAEGER_LOCAL_AGENT_ADDRESS=jaeger:6831
# - TRACING_PROVIDER_JAEGER_SAMPLING_TYPE=const
# - TRACING_PROVIDER_JAEGER_SAMPLING_VALUE=1
- CORS_ENABLED=true
- CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS}
restart: unless-stopped

pg:
Expand Down