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

changes for issue #126 #127

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

changes for issue #126 #127

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
13 changes: 7 additions & 6 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,12 @@ WEBAPI_SECURITY_PROVIDER="DisabledSecurity" # Change to AtlasRegularSecurity

# Basic
SECURITY_AUTH_JDBC_ENABLED="false"
SECURITY_DB_DATASOURCE_SCHEMA=""
SECURITY_DB_DATASOURCE_URL=""
SECURITY_DB_DATASOURCE_DRIVERCLASSNAME=""
SECURITY_DB_DATASOURCE_USERNAME=""
SECURITY_DB_DATASOURCE_PASSWORD=""
SECURITY_DB_DATASOURCE_SCHEMA="webapi_security"
SECURITY_DB_DATASOURCE_URL="jdbc:postgresql://broadsea-atlasdb:5432/postgres"
SECURITY_DB_DATASOURCE_DRIVERCLASSNAME="org.postgresql.Driver"
SECURITY_DB_DATASOURCE_USERNAME="postgres"
SECURITY_DB_DATASOURCE_PASSWORD="mypass"
SECURITY_DB_DATASOURCE_AUTHENTICATIONQUERY="select password from webapi_security.security where lower(email) = lower(?)"

# LDAP
SECURITY_AUTH_LDAP_ENABLED="false"
Expand Down Expand Up @@ -231,4 +232,4 @@ ARES_DATA_FOLDER="./ares_data"

CONTENT_ARES_DISPLAY="show"
CONTENT_ATLAS_DISPLAY="show"
CONTENT_HADES_DISPLAY="show"
CONTENT_HADES_DISPLAY="show"
1 change: 1 addition & 0 deletions ohdsi-webapi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ services:
SECURITY_DB_DATASOURCE_DRIVERCLASSNAME: ${SECURITY_DB_DATASOURCE_DRIVERCLASSNAME}
SECURITY_DB_DATASOURCE_USERNAME: ${SECURITY_DB_DATASOURCE_USERNAME}
SECURITY_DB_DATASOURCE_PASSWORD: ${SECURITY_DB_DATASOURCE_PASSWORD}
SECURITY_DB_DATASOURCE_AUTHENTICATIONQUERY: ${SECURITY_DB_DATASOURCE_AUTHENTICATIONQUERY}

# Security env variables - LDAP

Expand Down