From d6e320004918c127abbcafabf700ce0d5af1e36b Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 16 Mar 2018 09:33:04 +0100 Subject: [PATCH] deploy proxy ver 1.0.12 --- .../eidas-proxy/se/cfg/application.properties | 23 ++++++++++--------- global/overlay/etc/puppet/cosmos-rules.yaml | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties index ebd4cb82..a43bcb8a 100644 --- a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties +++ b/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties @@ -64,32 +64,33 @@ proxy-service.consent.valuetranslation=urn:oid:1.3.6.1.5.5.7.9.3 proxy-service.welcomepage.markdown=${proxy-service.path.prefix}/cfg/infotext.md #Metadata Service List location specified as either URL (http or https), "file://" or "classpath:" -proxy-service.eidasMdListLocation=https://eid.svelegtest.se/nodeconfig/mdservicelist +proxy-service.eidasMdListLocation=https://qa.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml # Optional certificate file for validating metadata service list file signatures # If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set -proxy-service.eidasMdListCertFile=${proxy-service.path.prefix}/eIDASmdListCert.crt +proxy-service.eidasMdListCertFile=${proxy-service.path.prefix}/cfg/metadata.crt #Metadata location for aggregated metadata specified as either URL (http or https), "file://" or "classpath:" -proxy-service.eidasMetadataLocation=https://eid.svelegtest.se/nodeconfig/metadata +proxy-service.eidasMetadataLocation=https://qa.md.eidas.swedenconnect.se/role/sp.xml # Optional certificate file for validating metadata signatures # If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set -proxy-service.eidasMetadataCertFile=${proxy-service.path.prefix}/eIDASmdListCert.crt +proxy-service.eidasMetadataCertFile=${proxy-service.path.prefix}/cfg/metadata.crt # Optional cache dir for caching downloaded metadata. If not set, cache is stored in memory. proxy-service.eidasMetadataCacheDirName=${proxy-service.path.prefix}/ps-mdcache - #Metadata location for national IdP metadata specified as either URL (http or https), "file://" or "classpath:" -proxy-service.nationalMetadataLocation=http://eid.svelegtest.se/metadata/mdx/role/idp.xml -# Optional certificate file for validating metadata signatures -# If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set -proxy-service.nationalMetadataCert=${proxy-service.path.prefix}/se-metadata-cert.crt +proxy-service.nationalMetadata.test.location=http://eid.svelegtest.se/metadata/mdx/role/idp.xml +proxy-service.nationalMetadata.test.certFile=${proxy-service.path.prefix}/cfg/se-metadata-cert.crt +proxy-service.nationalMetadata.test.cacheFile=${proxy-service.path.prefix}/cache/test-metadata.xml +proxy-service.nationalMetadata.test.index=1 -# Optional cache dir for caching downloaded national metadata. If not set, cache is stored in memory. -proxy-service.nationalPsMetadataCacheDirName=${proxy-service.path.prefix}/ps-mdcache +proxy-service.nationalMetadata.qa.location=https://qa.md.swedenconnect.se/role/idp.xml +proxy-service.nationalMetadata.qa.certFile=${proxy-service.path.prefix}/cfg/metadata.crt +proxy-service.nationalMetadata.qa.cacheFile=${proxy-service.path.prefix}/cache/qa-metadata.xml +proxy-service.nationalMetadata.qa.index=0 management.context-path=/manage management.security.enabled=false diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 6f671873..5967c988 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -97,7 +97,7 @@ md-eu1.qa.komreg.net: autoupdate: servicemonitor: eidas_proxy: - version: 1.0.10 + version: 1.0.12 sunet::frontend::register_sites: sites: 'se.proxy.qa.sveidas.se':