From 13058dac58dd2664e8cd9c3e47428c0cbba8c81f Mon Sep 17 00:00:00 2001 From: himeshr Date: Tue, 10 Dec 2024 18:41:10 +0530 Subject: [PATCH] avniproject/avni-webapp#1337 | Use OPENCHS_DATABASE_HOST instead of OPENCHS_DATABASE_SERVER --- avni-server-api/src/main/resources/application.properties | 2 +- avni-server-api/src/test/resources/application.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/avni-server-api/src/main/resources/application.properties b/avni-server-api/src/main/resources/application.properties index 1a73e065e..00bdfce5c 100644 --- a/avni-server-api/src/main/resources/application.properties +++ b/avni-server-api/src/main/resources/application.properties @@ -4,7 +4,7 @@ spring.profiles.active=${OPENCHS_MODE:dev} # Database avni.database=${OPENCHS_DATABASE:openchs} avni.database.port=${OPENCHS_DATABASE_PORT:5432} -avni.database.server=${OPENCHS_DATABASE_SERVER:localhost} +avni.database.server=${OPENCHS_DATABASE_HOST:localhost} spring.datasource.url=${OPENCHS_DATABASE_URL:jdbc:postgresql://${avni.database.server}:${avni.database.port}/${avni.database}?currentSchema=public} spring.datasource.username=${OPENCHS_DATABASE_USER:openchs} spring.datasource.password=${OPENCHS_DATABASE_PASSWORD:password} diff --git a/avni-server-api/src/test/resources/application.properties b/avni-server-api/src/test/resources/application.properties index 73922b4e9..eb7831e9e 100644 --- a/avni-server-api/src/test/resources/application.properties +++ b/avni-server-api/src/test/resources/application.properties @@ -6,7 +6,7 @@ spring.servlet.multipart.max-file-size=10028KB spring.servlet.multipart.max-request-size=10028KB avni.database=${OPENCHS_DATABASE:openchs} avni.database.port=${OPENCHS_DATABASE_PORT:5432} -avni.database.server=${OPENCHS_DATABASE_SERVER:localhost} +avni.database.server=${OPENCHS_DATABASE_HOST:localhost} spring.datasource.url=${OPENCHS_DATABASE_URL:jdbc:postgresql://${avni.database.server}:${avni.database.port}/openchs_test} spring.datasource.username=${OPENCHS_DATABASE_USER:openchs} spring.datasource.password=${OPENCHS_DATABASE_PASSWORD:password}