Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pass-core user env names #380

Merged
merged 1 commit into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .eclipse-pass.local_env
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ AWS_SQS_ENDPOINT_OVERRIDE=http://localstack:4566
# PASS_CORE config ################################
###################################################
PASS_CORE_BASE_URL=http://localhost:8080
PASS_CORE_BACKEND_USER=backend
PASS_CORE_BACKEND_PASSWORD=backend
PASS_CORE_USER=backend
PASS_CORE_PASSWORD=backend

PASS_CORE_POSTGRES_PORT=5432
PASS_CORE_DATABASE_URL=jdbc:postgresql://postgres:5432/pass
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ Environment variables:

* `PASS_CORE_BASE_URL=http://localhost:8080` : Used when generating JSON API relationship links. Needs to be absolute and must change to match deployment environment
* `PASS_CORE_POSTGRES_PORT=5432`
* `PASS_CORE_BACKEND_USER=backend`
* `PASS_CORE_BACKEND_PASSWORD=backend`
* `PASS_CORE__USER=backend`
* `PASS_CORE_PASSWORD=backend`
* `PASS_CORE_APP_LOCATION=http://pass-ui:81/app/` : Resource location of pass ui resources
* `PASS_CORE_APP_CSP=default-src 'self';` : Content Security Policy header value
* `PASS_CORE_IDP_METADATA=http://idp:8080/idp/shibboleth` : Resource location of IDP metadata
Expand Down
4 changes: 2 additions & 2 deletions eclipse-pass.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
- .env
- .eclipse-pass.local_env
healthcheck:
test: 'curl -u "$$PASS_CORE_BACKEND_USER:$$PASS_CORE_BACKEND_PASSWORD" -f http://pass-core:8080/data/user || exit 1'
test: 'curl -u "$$PASS_CORE_USER:$$PASS_CORE_PASSWORD" -f http://pass-core:8080/data/user || exit 1'
start_period: 60s
interval: 5s
ports:
Expand Down Expand Up @@ -103,7 +103,7 @@ services:
- .env
- .eclipse-pass.local_env
entrypoint: /bin/sh -c
command: [ 'curl http://pass-core:8080/data/ -u "$$PASS_CORE_BACKEND_USER:$$PASS_CORE_BACKEND_PASSWORD" -X PATCH -H "content-type: application/vnd.api+json;ext=jsonpatch" -H "accept:application/vnd.api+json; ext=jsonpatch" -H "X-XSRF-TOKEN:moo" -H "Cookie:XSRF-TOKEN=moo" -d "@/data.json"' ]
command: [ 'curl http://pass-core:8080/data/ -u "$$PASS_CORE_USER:$$PASS_CORE_PASSWORD" -X PATCH -H "content-type: application/vnd.api+json;ext=jsonpatch" -H "accept:application/vnd.api+json; ext=jsonpatch" -H "X-XSRF-TOKEN:moo" -H "Cookie:XSRF-TOKEN=moo" -d "@/data.json"' ]
networks:
- back
depends_on:
Expand Down
Loading