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.

Sign up for GitHub

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

OZ-573: Remove referencing of env vars declared within same .env file #133

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OZ-573: Remove referencing of env vars declared within same .env file #133

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
4 changes: 1 addition & 3 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,12 @@ ODOO_CLIENT_UUID=70a0e2fd-2bb2-4417-9fc6-22cdca1bb5be
ODOO_CLIENT_SECRET=z3epa8rE66tUIZz6

KEYCLOAK_ADMIN_SA_CLIENT_SECRET=5HuMNB6gwHd0fY2L
EIP_CLIENT_SECRET=h9PQzv6zWnVl1yxnhdfZulnW7FPqPlci

#
# EIP OAuth2
#
OAUTH_ENABLED=${ENABLE_SSO}
OAUTH_CLIENT_ID=eip
OAUTH_CLIENT_SECRET=${EIP_CLIENT_SECRET}
OAUTH_CLIENT_SECRET=h9PQzv6zWnVl1yxnhdfZulnW7FPqPlci
OAUTH_CLIENT_SCOPE=openid
OAUTH_ACCESS_TOKEN_URL=http://keycloak:8080/realms/ozone/protocol/openid-connect/token

Expand Down
6 changes: 3 additions & 3 deletions docker-compose-bundled-sso.yml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
SUPERSET_CLIENT_SECRET: \${SUPERSET_CLIENT_SECRET}
SUPERSET_CLIENT_UUID: \${SUPERSET_CLIENT_UUID}
KEYCLOAK_ADMIN_SA_CLIENT_SECRET: \${KEYCLOAK_ADMIN_SA_CLIENT_SECRET}
EIP_CLIENT_SECRET: \${EIP_CLIENT_SECRET}
EIP_CLIENT_SECRET: \${OAUTH_CLIENT_SECRET}
KEYCLOAK_EXTRA_ARGS_PREPENDED: "--spi-login-protocol-openid-connect-legacy-logout-redirect-uri=true"
KEYCLOAK_EXTRA_ARGS: "
-Dkeycloak.profile.feature.scripts=enabled
Expand Down Expand Up @@ -81,7 +81,7 @@ services:
eip-odoo-openmrs:
environment:
OAUTH_ACCESS_TOKEN_URL: \${OAUTH_ACCESS_TOKEN_URL}
OAUTH_ENABLED: \${OAUTH_ENABLED}
OAUTH_ENABLED: \${ENABLE_SSO}
OAUTH_CLIENT_ID: \${OAUTH_CLIENT_ID}
OAUTH_CLIENT_SECRET: \${OAUTH_CLIENT_SECRET}
OAUTH_CLIENT_SCOPE: \${OAUTH_CLIENT_SCOPE}
Expand Down Expand Up @@ -109,7 +109,7 @@ services:
eip-openmrs-senaite:
environment:
OAUTH_ACCESS_TOKEN_URL: \${OAUTH_ACCESS_TOKEN_URL}
OAUTH_ENABLED: \${OAUTH_ENABLED}
OAUTH_ENABLED: \${ENABLE_SSO}
OAUTH_CLIENT_ID: \${OAUTH_CLIENT_ID}
OAUTH_CLIENT_SECRET: \${OAUTH_CLIENT_SECRET}
OAUTH_CLIENT_SCOPE: \${OAUTH_CLIENT_SCOPE}
2 changes: 1 addition & 1 deletion docker-compose-erpnext-sso.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
x-oauth-variables: &oauth-variables
OAUTH_ACCESS_TOKEN_URL: ${OAUTH_ACCESS_TOKEN_URL}
OAUTH_ENABLED: ${OAUTH_ENABLED}
OAUTH_ENABLED: ${ENABLE_SSO}
OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID}
OAUTH_CLIENT_SECRET: ${OAUTH_CLIENT_SECRET}
OAUTH_CLIENT_SCOPE: ${OAUTH_CLIENT_SCOPE}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-keycloak.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ services:
- KEYCLOAK_URL=${SERVER_SCHEME}://${KEYCLOAK_HOSTNAME}
- KEYCLOAK_INTERNAL_HOST_URL=${KEYCLOAK_INTERNAL_HOST_URL}
- KEYCLOAK_ADMIN_SA_CLIENT_SECRET=${KEYCLOAK_ADMIN_SA_CLIENT_SECRET}
- EIP_CLIENT_SECRET=${EIP_CLIENT_SECRET}
- EIP_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}
- OPENMRS_PUBLIC_URL=${SERVER_SCHEME}://${O3_HOSTNAME}
- OPENMRS_CLIENT_UUID=${OPENMRS_CLIENT_UUID}
- OPENMRS_CLIENT_SECRET=${OPENMRS_CLIENT_SECRET}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-odoo-sso.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
eip-odoo-openmrs:
environment:
OAUTH_ACCESS_TOKEN_URL: ${OAUTH_ACCESS_TOKEN_URL}
OAUTH_ENABLED: ${OAUTH_ENABLED}
OAUTH_ENABLED: ${ENABLE_SSO}
OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID}
OAUTH_CLIENT_SECRET: ${OAUTH_CLIENT_SECRET}
OAUTH_CLIENT_SCOPE: ${OAUTH_CLIENT_SCOPE}
2 changes: 1 addition & 1 deletion docker-compose-senaite-sso.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
eip-openmrs-senaite:
environment:
OAUTH_ACCESS_TOKEN_URL: ${OAUTH_ACCESS_TOKEN_URL}
OAUTH_ENABLED: ${OAUTH_ENABLED}
OAUTH_ENABLED: ${ENABLE_SSO}
OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID}
OAUTH_CLIENT_SECRET: ${OAUTH_CLIENT_SECRET}
OAUTH_CLIENT_SCOPE: ${OAUTH_CLIENT_SCOPE}
Loading