From 449587d63643852e2cd0ec5a437f73b7f1c2575e Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 11 Dec 2017 14:25:51 +0100 Subject: [PATCH] correct defaults --- .../etc/eidas-connector/eidas-connector.conf | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/eidas-node/overlay/etc/eidas-connector/eidas-connector.conf b/eidas-node/overlay/etc/eidas-connector/eidas-connector.conf index 04dcaea4..3eaa6929 100644 --- a/eidas-node/overlay/etc/eidas-connector/eidas-connector.conf +++ b/eidas-node/overlay/etc/eidas-connector/eidas-connector.conf @@ -34,25 +34,26 @@ export JVM_START_HEA=512m export IDP_TLS_TRUSTED_CERTS=/etc/ssl/certs/infra.crt -export IDP_CREDENTIALS=/etc/eidas-connector/credentials +export IDP_CREDENTIALS=/etc/eidas-connector/credentials/idp +export IDP_SEALER_STORE_RESOURCE=$IDP_CREDENTIALS/sealer.jks +export IDP_SEALER_VERSION_RESOURCES=$IDP_CREDENTIALS/sealer.kver +export IDP_SIGNING_KEY=$IDP_CREDENTIALS/idp-signing.key +export IDP_SIGNING_CERT=$IDP_CREDENTIALS/idp-signing.crt +export IDP_ENCRYPTION_KEY=$IDP_CREDENTIALS/idp-encryption.key +export IDP_ENCRYPTION_CERT=$IDP_CREDENTIALS/idp-encryption.crt +export IDP_METADATA_SIGNING_KEY=$IDP_CREDENTIALS/metadata-signing.key +export IDP_METADATA_SIGNING_CERT=$IDP_CREDENTIALS/metadata-signing.crt -export IDP_SEALER_STORE_RESOURCE=$IDP_CREDENTIALS/idp/sealer.jks -export IDP_SEALER_VERSION_RESOURCES=$IDP_CREDENTIALS/idp/sealer.kver -export IDP_SIGNING_KEY=$IDP_CREDENTIALS/idp/idp-signing.key -export IDP_SIGNING_CERT=$IDP_CREDENTIALS/idp/idp-signing.crt -export IDP_ENCRYPTION_KEY=$IDP_CREDENTIALS/idp/idp-encryption.key -export IDP_ENCRYPTION_CERT=$IDP_CREDENTIALS/idp/idp-encryption.crt -export IDP_METADATA_SIGNING_KEY=$IDP_CREDENTIALS/idp/metadata-signing.key -export IDP_METADATA_SIGNING_CERT=$IDP_CREDENTIALS/idp/metadata-signing.crt - -export SP_SIGNING_KEY=$SP_CREDENTIALS/sp/sp-signing.key -export SP_SIGNING_CERT=$SP_CREDENTIALS/sp/sp-signing.crt -export SP_ENCRYPTION_KEY=$SP_CREDENTIALS/sp/sp-encryption.key -export SP_ENCRYPTION_CERT=$SP_CREDENTIALS/sp/sp-encryption.crt -export SP_METADATA_SIGNING_KEY=$SP_CREDENTIALS/sp/metadata-signing.key -export SP_METADATA_SIGNING_CERT=$SP_CREDENTIALS/sp/metadata-signing.crt +export SP_CREDENTIALS=/etc/eidas-connector/credentials/sp +export SP_SIGNING_KEY=$SP_CREDENTIALS/sp-signing.key +export SP_SIGNING_CERT=$SP_CREDENTIALS/sp-signing.crt +export SP_ENCRYPTION_KEY=$SP_CREDENTIALS/sp-encryption.key +export SP_ENCRYPTION_CERT=$SP_CREDENTIALS/sp-encryption.crt +export SP_METADATA_SIGNING_KEY=$SP_CREDENTIALS/metadata-signing.key +export SP_METADATA_SIGNING_CERT=$SP_CREDENTIALS/metadata-signing.crt # Tomcat settings -export TOMCAT_TLS_SERVER_KEY=$IDP_CREDENTIALS/tomcat/tomcat-key.pem -export TOMCAT_TLS_SERVER_CERTIFICATE=$IDP_CREDENTIALS/tomcat/tomcat-cert.pem -export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$IDP_CREDENTIALS/tomcat/tomcat-chain.pem +export TOMCAT_CREDENTIALS=/etc/eidas-connector/credentials/tomcat +export TOMCAT_TLS_SERVER_KEY=$TOCMAT_CREDENTIALS/tomcat-key.pem +export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem +export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem