From b38c47918a60e85ac8b90b58ded3673e24757a8b Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 24 Nov 2017 08:47:56 +0100
Subject: [PATCH] move a buch of env variables from eidas-connector.conf

---
 .../overlay/etc/puppet/manifests/cosmos-site.pp  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index cfe4e719..ad2b6fe7 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -255,6 +255,22 @@ class eidas_connector {
                    "IDP_PERSISTENT_ID_SALT=$idp_persistent_id_salt",
                    "IDP_SEALER_PASSWORD=$idp_sealer_password",
                    "IDP_SEALER_STORE_RESOURCE=/etc/eidas-connector/credentials/idp/sealer.jks",
+                   "IDP_SEALER_VERSION_RESOURCES=/etc/eidas-connector/credentials/idp/sealer.kver",
+                   "IDP_SIGNING_KEY=/etc/eidas-connector/credentials/idp/idp-signing.key",
+                   "IDP_SIGNING_CERT=/etc/eidas-connector/credentials/idp/idp-signing.crt",
+                   "IDP_ENCRYPTION_KEY=/etc/eidas-connector/credentials/idp/idp-encryption.key",
+                   "IDP_ENCRYPTION_CERT=/etc/eidas-connector/credentials/idp/idp-encryption.crt",
+                   "IDP_METADATA_SIGNING_KEY=/etc/eidas-connector/credentials/idp/metadata-signing.key",
+                   "IDP_METADATA_SIGNING_CERT=/etc/eidas-connector/credentials/idp/metadata-signing.crt",
+                   "SP_SIGNING_KEY=/etc/eidas-connector/credentials/sp/sp-signing.key",
+                   "SP_SIGNING_CERT=/etc/eidas-connector/credentials/sp/sp-signing.crt",
+                   "SP_ENCRYPTION_KEY=/etc/eidas-connector/credentials/sp/sp-encryption.key",
+                   "SP_ENCRYPTION_CERT=/etc/eidas-connector/credentials/sp/sp-encryption.crt",
+                   "SP_METADATA_SIGNING_KEY=/etc/eidas-connector/credentials/sp/metadata-signing.key",
+                   "SP_METADATA_SIGNING_CERT=/etc/eidas-connector/credentials/sp/metadata-signing.crt",
+                   "TOMCAT_TLS_SERVER_KEY=/etc/eidas-connector/credentials/tomcat/tomcat-key.pem",
+                   "TOMCAT_TLS_SERVER_CERTIFICATE=/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem",
+                   "TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem",
                    "IDP_FTICKS_SALT=$idp_fticks_salt"]
    } ->
    class {'webserver': } ->