new configuration version

This commit is contained in:
mamo 2024-11-28 11:57:08 +00:00
parent 3954e3bb70
commit 7b7680f9e3
4 changed files with 3 additions and 21 deletions

View File

@ -45,7 +45,7 @@ spec:
podDisruptionBudget:
maxUnavailable: "50%"
git:
tag: "r-5d38f44fbf7ba4433e88f147dbabae44ae518f57"
tag: "r-0df3d146756373839463f33659ac91ff62db0217"
dir: "DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT/DEFAULT-ADN-POST-IAM-TKNXCHNG-INV/nai"
credentials: "git-credentials"
keystores:
@ -54,7 +54,6 @@ spec:
truststores:
- "nai-default-tls-client-trust"
- "nai-default-default-signer-trust"
- "nai-default-tls-trust"
podSecurity:
policy: "baseline"
automountServiceAccountToken: false

View File

@ -1,12 +0,0 @@
apiVersion: "operator.nevis-security.ch/v1"
kind: "NevisTrustStore"
metadata:
name: "nai-default-tls-trust"
namespace: "adn-postit-tknxchng-01-dev"
labels:
deploymentTarget: "nai"
annotations:
projectKey: "DEFAULT-ADN-POST-IAM-TKNXCHNG-PROJECT"
patternId: "6ec6739e824c8e56d9633622"
spec:
keystores: []

View File

@ -14,7 +14,7 @@ JAVA_OPTS=(
"-Dotel.javaagent.configuration-file=/var/opt/nevisauth/default/conf/otel.properties"
"-Dotel.resource.attributes=service.version=8.2405.2,service.instance.id=$HOSTNAME"
"-Dch.nevis.auth.httpclient.tls.trustStoreRef=/var/opt/keys/trust/tls-swissid"
"-Djavax.net.ssl.trustStore=/var/opt/keys/trust/nai-default-tls-trust/truststore.p12"
"-Djavax.net.ssl.trustStorePassword=\${exec:/var/opt/keys/trust/nai-default-tls-trust/keypass}"
"-Djavax.net.ssl.trustStore=/var/opt/keys/trust/tls-swissid/truststore.p12"
"-Djavax.net.ssl.trustStorePassword=\${exec:/var/opt/keys/trust/tls-swissid/keypass}"
)

View File

@ -42,11 +42,6 @@
<!-- source: pattern://d9ea344685ab4a9bb0e1e3e7 -->
<KeyObject name="tokensigner" certificate="/var/opt/keys/own/tokensigner/cert.pem" privateKey="/var/opt/keys/own/tokensigner/keystore.jks" passPhrase="pipe:///var/opt/keys/own/tokensigner/keypass"/>
</KeyStore>
<!-- source: pattern://a37cd4e5f5c48f7d7db35f3f -->
<KeyStore name="IdTokenVerification">
<!-- source: pattern://a37cd4e5f5c48f7d7db35f3f -->
<KeyObject name="tls_swissid" certificate="/var/opt/keys/trust/tls-swissid/truststore.jks"/>
</KeyStore>
</SessionCoordinator>
<!-- source: pattern://6ec6739e824c8e56d9633622 -->
<LocalOutOfContextDataStore reaperPeriod="60"/>