diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9f7c8a..16f7566 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,6 +75,8 @@ jobs: 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/oph-configuration $DOCKER_BUILD_DIR/config/oph-configuration/ + ls $DOCKER_BUILD_DIR/config/oph-configuration/ + cat $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 diff --git a/ovara-backend/.gitignore b/ovara-backend/.gitignore index 335b228..3f01b82 100644 --- a/ovara-backend/.gitignore +++ b/ovara-backend/.gitignore @@ -34,6 +34,6 @@ build/ .mise.toml -application-dev.properties +src/main/resources/oph-configuration/application-dev.properties ovara.dump \ No newline at end of file diff --git a/ovara-backend/src/main/resources/application.properties b/ovara-backend/src/main/resources/oph-configuration/application.properties similarity index 82% rename from ovara-backend/src/main/resources/application.properties rename to ovara-backend/src/main/resources/oph-configuration/application.properties index 9a1332b..91ee443 100644 --- a/ovara-backend/src/main/resources/application.properties +++ b/ovara-backend/src/main/resources/oph-configuration/application.properties @@ -12,5 +12,5 @@ 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}} +ovara-backend.cas.username=ovara_backend +ovara-backend.cas.password={{ovara_backend_cas_password}} \ No newline at end of file diff --git a/ovara-backend/src/main/resources/oph-configuration/application.properties.template b/ovara-backend/src/main/resources/oph-configuration/application.properties.template index 9a1332b..5f8546b 100644 --- a/ovara-backend/src/main/resources/oph-configuration/application.properties.template +++ b/ovara-backend/src/main/resources/oph-configuration/application.properties.template @@ -1,3 +1,6 @@ +spring.profiles.active=production +debug=true + spring.application.name=ovara-backend server.servlet.context-path=/ovara-backend @@ -13,4 +16,4 @@ 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}} +ovara-backend.cas.password={{ovara_backend_cas_password}} \ No newline at end of file