Skip to content

Commit

Permalink
changed the postgres variables to align local with the test environme…
Browse files Browse the repository at this point in the history
…nt, and same for the application.yml for the spring boot (#402)
  • Loading branch information
jazzgrewal authored Oct 15, 2024
1 parent 23183dc commit 7d932d9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ spring:
# Database, and JPA - Postgres
postgres:
driver-class-name: org.postgresql.Driver
url: jdbc:postgresql://${POSTGRES_HOST:localhost}:5432/${POSTGRES_DB:postgres}
username: ${POSTGRES_USER:postgres}
url: jdbc:postgresql://${POSTGRES_HOST:localhost}:5432/${POSTGRES_DB:nr-silva}
username: ${POSTGRES_USER:nr-silva}
password: ${POSTGRES_PASSWORD:default}
connectionTimeout: ${DB_POOL_CONN_TIMEOUT:120000}
idleTimeout: ${DB_POOL_IDLE_TIMEOUT:60000}
Expand Down Expand Up @@ -60,8 +60,8 @@ spring:
enabled: true
baseline-on-migrate: true
locations: classpath:db/migration
url: jdbc:postgresql://${POSTGRES_HOST:localhost}:5432/${POSTGRES_DB:postgres}
user: ${POSTGRES_USER:postgres}
url: jdbc:postgresql://${POSTGRES_HOST:localhost}:5432/${POSTGRES_DB:nr-silva}
user: ${POSTGRES_USER:nr-silva}
password: ${POSTGRES_PASSWORD:default}

# OpenSearch settings
Expand Down Expand Up @@ -105,7 +105,7 @@ nr:
wms-layers:
whitelist: ${WMS_LAYERS_WHITELIST_USERS:NONE}
opening-search:
org-units: ${OPENING_SEARCH_ORG_UNITS:DCK}
org-units: ${OPENING_SEARCH_ORG_UNITS:-"DCK,DSQ,DVA,DKM,DSC,DFN,DSI,DCR,DMK,DQC,DKA,DCS,DOS,DSE,DCC,DMH,DQU,DNI,DND,DRM,DPG,DSS,DPC"}

# Forest Client API
forest-client-api:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ x-backend: &backend
#restart: always

x-db-vars: &db-vars
POSTGRES_USER: postgres
POSTGRES_USER: nr-silva
POSTGRES_PASSWORD: default
POSTGRES_DB: postgres
POSTGRES_DB: nr-silva

services:
frontend:
Expand Down

0 comments on commit 7d932d9

Please sign in to comment.