OK-735: Käytetään propertiesissä host_virkailija-muuttujaa

Opetushallitus · Nov 27, 2024 · 49af68f · 49af68f
1 parent 477780a
commit 49af68f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -73,9 +73,6 @@ jobs:
           export ARTIFACT_NAME="ovara-backend"
           export BASE_IMAGE="baseimage-fatjar-openjdk21:master"
           source ci-tools/common/setup-tools.sh
-          printf "HELLO\n"
-          ls ovara-backend
-          env
           mv ovara-backend/target/ovara-backend-*.jar $DOCKER_BUILD_DIR/artifact/${ARTIFACT_NAME}.jar
           cp -vr ovara-backend/src/main/resources/application.properties $DOCKER_BUILD_DIR/config/
           ./ci-tools/common/pull-image.sh

diff --git a/ovara-backend/src/main/resources/application.properties b/ovara-backend/src/main/resources/application.properties
@@ -3,14 +3,14 @@ server.servlet.context-path=/ovara-backend
 
 # ENVIRONMENT SPECIFIC CONFIG
 # DB CONNECTION
-spring.datasource.url=jdbc:postgresql://localhost:5432/ovara
-spring.datasource.username=app
-spring.datasource.password=<password>
+spring.datasource.url={{host_postgresql_ovara}}
+spring.datasource.username={{ovara_backend_postgresql_username}}
+spring.datasource.password={{ovara_backend_postgresql_password}}
 
 # CAS
-opintopolku.virkailija.domain=https://virkailija.opintopolku.fi
-ovara.backend.url=${opintopolku.virkailija.domain}/ovara-backend
-ovara.ui.url=${opintopolku.virkailija.domain}
-cas.url=${opintopolku.virkailija.domain}/cas
-ovara-backend.cas.username=ovara_backend
-ovara-backend.cas.password=<password>
+opintopolku.virkailija.domain={{host_virkailija}}
+ovara.backend.url=https://${opintopolku.virkailija.domain}/ovara-backend
+ovara.ui.url=https://${opintopolku.virkailija.domain}
+cas.url=https://${opintopolku.virkailija.domain}/cas
+ovara-backend.cas.username={{ovara_backend_cas_username}}
+ovara-backend.cas.password={{ovara_backend_cas_password}}