From 9e91368bfecb32b79099cb2b064ec1826605fc7c Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Mon, 28 Oct 2024 15:38:19 +0100 Subject: [PATCH] =?UTF-8?q?-=20Mindre=20framtidig=20forvirring;=20vi=20kon?= =?UTF-8?q?verterer=20til=20en=20PKCS#8=20(pk8)=20private=20key=20lagret?= =?UTF-8?q?=20p=C3=A5=20formatet=20PEM.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../99-dolly-convert-to-pk8.sh | 2 +- .../src/main/resources/application-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/levende-arbeidsforhold-ansettelse/99-dolly-convert-to-pk8.sh b/apps/levende-arbeidsforhold-ansettelse/99-dolly-convert-to-pk8.sh index c1ea771178f..49cfce0b64e 100644 --- a/apps/levende-arbeidsforhold-ansettelse/99-dolly-convert-to-pk8.sh +++ b/apps/levende-arbeidsforhold-ansettelse/99-dolly-convert-to-pk8.sh @@ -3,4 +3,4 @@ # # Converts NAIS provided key.pem to PKCS#8 PEM format, which can be used by R2dbc. # -openssl pkey -in /var/run/secrets/nais.io/sqlcertificate/key.pem -out /tmp/key.pk8 \ No newline at end of file +openssl pkey -in /var/run/secrets/nais.io/sqlcertificate/key.pem -out /tmp/pk8.pem \ No newline at end of file diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-prod.yml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-prod.yml index ecacb3a82ef..67030d4ac12 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-prod.yml +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-prod.yml @@ -5,7 +5,7 @@ spring: password: ${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_TESTNAV_LEVENDE_ARBEIDSFORHOLD_PASSWORD} properties: sslCert: ${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_TESTNAV_LEVENDE_ARBEIDSFORHOLD_SSLCERT} - sslKey: /tmp/key.pk8 # See Dockerfile and 99-dolly-convert-to-pk8.sh. + sslKey: /tmp/pk8.pem # See Dockerfile and 99-dolly-convert-to-pk8.sh. sslMode: ${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_TESTNAV_LEVENDE_ARBEIDSFORHOLD_SSLMODE} sslRootCert: ${NAIS_DATABASE_TESTNAV_LEVENDE_ARBEIDSFORHOLD_TESTNAV_LEVENDE_ARBEIDSFORHOLD_SSLROOTCERT} flyway: