Merge branch 'develop' of github.com:Sphereon-Opensource/OpenID-Feder…

…ation into feature/OIDF-46 # Conflicts: # .github/workflows/ci.yml # gradle/libs.versions.toml # modules/admin-server/build.gradle.kts # modules/admin-server/src/main/resources/application.properties
Sphereon-Opensource · Jul 10, 2024 · 7bfa3be · 7bfa3be
2 parents 2ba8c90 + 1639346
commit 7bfa3be
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/modules/admin-server/src/main/resources/application.properties b/modules/admin-server/src/main/resources/application.properties
@@ -1,8 +1,10 @@
+spring.config.import=optional:file:../../.env[.properties]
+
 spring.application.name=OpenID Federation
 
-spring.datasource.url=jdbc:postgresql://localhost:5432/openid-federation-db
-spring.datasource.username=openid-federation-db-user
-spring.datasource.password=openid-federation-db-password
+spring.datasource.url=${DATASOURCE_URL}
+spring.datasource.username=${DATASOURCE_USER}
+spring.datasource.password=${DATASOURCE_PASSWORD}
 spring.datasource.driver-class-name=org.postgresql.Driver
 
 # Flyway
@@ -14,4 +16,4 @@ spring.flyway.baseline-version=0
 
 # Mapping /actuator/health to /status
 management.endpoints.web.base-path=/
-management.endpoints.web.path-mapping.health=status
+management.endpoints.web.path-mapping.health=status