Skip to content

Commit

Permalink
OK-735: muutetaan /ping-polun nimi /healthcheckiksi
Browse files Browse the repository at this point in the history
  • Loading branch information
heidilm committed Nov 28, 2024
1 parent 49af68f commit 74097d8
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
export BASE_IMAGE="baseimage-fatjar-openjdk21:master"
source ci-tools/common/setup-tools.sh
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/
cp -vr ovara-backend/src/main/resources/oph-configuration/application.properties.template $DOCKER_BUILD_DIR/config/oph-configuration/application.properties.template
./ci-tools/common/pull-image.sh
./ci-tools/github-build/build-fatjar.sh $ARTIFACT_NAME
./ci-tools/github-build/upload-image.sh $ARTIFACT_NAME
2 changes: 1 addition & 1 deletion ovara-backend/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spring.datasource.password={{ovara_backend_postgresql_password}}
# CAS
opintopolku.virkailija.domain={{host_virkailija}}
ovara.backend.url=https://${opintopolku.virkailija.domain}/ovara-backend
ovara.ui.url=https://${opintopolku.virkailija.domain}
ovara.ui.url=https://${opintopolku.virkailija.domain}/raportointi
cas.url=https://${opintopolku.virkailija.domain}/cas
ovara-backend.cas.username={{ovara_backend_cas_username}}
ovara-backend.cas.password={{ovara_backend_cas_password}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
spring.application.name=ovara-backend
server.servlet.context-path=/ovara-backend

# ENVIRONMENT SPECIFIC CONFIG
# DB CONNECTION
spring.datasource.url={{host_postgresql_ovara}}
spring.datasource.username={{ovara_backend_postgresql_username}}
spring.datasource.password={{ovara_backend_postgresql_password}}

# CAS
opintopolku.virkailija.domain={{host_virkailija}}
ovara.backend.url=https://${opintopolku.virkailija.domain}/ovara-backend
ovara.ui.url=https://${opintopolku.virkailija.domain}/raportointi
cas.url=https://${opintopolku.virkailija.domain}/cas
ovara-backend.cas.username={{ovara_backend_cas_username}}
ovara-backend.cas.password={{ovara_backend_cas_password}}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Controller(
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
mapper.configure(SerializationFeature.INDENT_OUTPUT, true)

@GetMapping(path = Array("ping"))
@GetMapping(path = Array("healthcheck"))
def ping = "Ovara application is running!"

@GetMapping(path = Array("user"))
Expand Down

0 comments on commit 74097d8

Please sign in to comment.