From a6e1a67badc36c5d9e9df8ee068338ff5e25d955 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Mon, 3 Sep 2018 17:06:10 +0200 Subject: [PATCH] deploy 1.1.5 proxy --- .../se/cfg/general-metadata.properties | 14 ++++---- .../eidas-proxy/se/cfg/idpdisco.properties | 22 ++++++------ .../se/cfg/natsp-metadata.properties | 4 +-- .../se/cfg/general-metadata.properties | 14 ++++---- .../eidas-proxy/se/cfg/idpdisco.properties | 35 ++++++++++++++++++- .../se/cfg/natsp-metadata.properties | 4 +-- global/overlay/etc/puppet/cosmos-rules.yaml | 4 +-- 7 files changed, 65 insertions(+), 32 deletions(-) diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties index 8644a155..6c8f5590 100644 --- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties +++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties @@ -1,12 +1,12 @@ -psgen.country=SE -psgen.name=Sweden SE eIDAS ProxyService -psgen.orgName=Swedish E-Identification Board -psgen.dispName=Swedish eIDAS Proxy Service -psgen.orgUrl=http://eidasweb.se +psgen.country=${proxy-service.country} +psgen.name=Sweden eIDAS ProxyService +psgen.orgName=Sweden Connect +psgen.dispName=Swedish eIDAS Proxy Service QA +psgen.orgUrl=https://swedenconnect.se psgen.supportGivenName=Customer support psgen.techGivenName=Technical support -psgen.supportEmail=support@example.com -psgen.techEmail=support@example.com +psgen.supportEmail=support@swedenconnect.se +psgen.techEmail=support@swedenconnect.se diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties index 3ff17f43..f9ee4964 100644 --- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties +++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties @@ -10,21 +10,21 @@ idp.testIdp.name.en=Test IdP idp.testIdp.logo.uri=${proxy-service.domain.prefix}/img/se-flag-rnd.svg idp.testIdp.logo.height=67 idp.testIdp.logo.width=68 -idp.testIdp.loapolicy=natToEidasNotifiedMapping +idp.testIdp.loapolicy=justEidasLoa idp.testIdp.consent=true idp.testIdp.deriveDob=false idp.testIdp.index=0 -idp.mobIdp.entityid=https://midp.svelegtest.se/idp -idp.mobIdp.name.sv=Legacy Test ID Tjänst -idp.mobIdp.name.en=Legacy Test IdP -idp.mobIdp.logo.uri=${proxy-service.domain.prefix}/img/se-flag-rnd.svg -idp.mobIdp.logo.height=67 -idp.mobIdp.logo.width=68 -idp.mobIdp.loapolicy=natToEidasNotifiedMapping -idp.mobIdp.consent=false -idp.mobIdp.deriveDob=true -idp.mobIdp.index=1 +#idp.mobIdp.entityid=https://midp.svelegtest.se/idp +#idp.mobIdp.name.sv=Legacy Test ID Tjänst +#idp.mobIdp.name.en=Legacy Test IdP +#idp.mobIdp.logo.uri=${proxy-service.domain.prefix}/img/se-flag-rnd.svg +#idp.mobIdp.logo.height=67 +#idp.mobIdp.logo.width=68 +#idp.mobIdp.loapolicy=natToEidasNotifiedMapping +#idp.mobIdp.consent=false +#idp.mobIdp.deriveDob=true +#idp.mobIdp.index=1 #idp.ccBankid.entityid=https://eid.identityhub.se/demo/bankid/ #idp.ccBankid.name.sv=BankID diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties index 40cdd4b0..301fc7fc 100644 --- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties +++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties @@ -10,8 +10,8 @@ natsp.descriptions={\ } # Logos are specified as a map with the url as key followed by height,width[,lang] as comma separated parameters. natsp.logos={\ - '${proxy-service.domain.prefix}/img/logo_full.png':'432,547',\ - '${proxy-service.domain.prefix}/img/logo_notext_h67.png':'279,278'\ + '${proxy-service.domain.prefix}/img/sc-logo-temporary.svg':'60,168',\ + '${proxy-service.domain.prefix}/img/sc-logo-temporary-notext.svg':'60,60'\ } natsp.assertionConsumerServices={\ 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/assertionconsumer'\ diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties index 8644a155..6c8f5590 100644 --- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties +++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties @@ -1,12 +1,12 @@ -psgen.country=SE -psgen.name=Sweden SE eIDAS ProxyService -psgen.orgName=Swedish E-Identification Board -psgen.dispName=Swedish eIDAS Proxy Service -psgen.orgUrl=http://eidasweb.se +psgen.country=${proxy-service.country} +psgen.name=Sweden eIDAS ProxyService +psgen.orgName=Sweden Connect +psgen.dispName=Swedish eIDAS Proxy Service QA +psgen.orgUrl=https://swedenconnect.se psgen.supportGivenName=Customer support psgen.techGivenName=Technical support -psgen.supportEmail=support@example.com -psgen.techEmail=support@example.com +psgen.supportEmail=support@swedenconnect.se +psgen.techEmail=support@swedenconnect.se diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties index bf1973cd..f9ee4964 100644 --- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties +++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties @@ -10,7 +10,40 @@ idp.testIdp.name.en=Test IdP idp.testIdp.logo.uri=${proxy-service.domain.prefix}/img/se-flag-rnd.svg idp.testIdp.logo.height=67 idp.testIdp.logo.width=68 -idp.testIdp.loapolicy=natToEidasNotifiedMapping +idp.testIdp.loapolicy=justEidasLoa idp.testIdp.consent=true idp.testIdp.deriveDob=false idp.testIdp.index=0 + +#idp.mobIdp.entityid=https://midp.svelegtest.se/idp +#idp.mobIdp.name.sv=Legacy Test ID Tjänst +#idp.mobIdp.name.en=Legacy Test IdP +#idp.mobIdp.logo.uri=${proxy-service.domain.prefix}/img/se-flag-rnd.svg +#idp.mobIdp.logo.height=67 +#idp.mobIdp.logo.width=68 +#idp.mobIdp.loapolicy=natToEidasNotifiedMapping +#idp.mobIdp.consent=false +#idp.mobIdp.deriveDob=true +#idp.mobIdp.index=1 + +#idp.ccBankid.entityid=https://eid.identityhub.se/demo/bankid/ +#idp.ccBankid.name.sv=BankID +#idp.ccBankid.name.en=BankID +#idp.ccBankid.logo.uri=img/disco/bankid_logo.png +#idp.ccBankid.logo.height=94 +#idp.ccBankid.logo.width=100 +#idp.ccBankid.loapolicy=natToEidasNotifiedMapping +#idp.ccBankid.consent=true +#idp.ccBankid.deriveDob=true +#idp.ccBankid.index=2 + +#idp.ccTelia.entityid=https://eid.identityhub.se/demo/teliabrowserplugin/ +#idp.ccTelia.name.sv=Telia +#dp.ccTelia.name.en=Telia +#idp.ccTelia.logo.uri=img/disco/telia_min_logo.png +#idp.ccTelia.logo.height=89 +#idp.ccTelia.logo.width=86 +#idp.ccTelia.loapolicy=natToEidasNotifiedMapping +#idp.ccTelia.consent=true +#idp.ccTelia.deriveDob=true +#idp.ccTelia.index=3 diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties index 40cdd4b0..301fc7fc 100644 --- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties +++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties @@ -10,8 +10,8 @@ natsp.descriptions={\ } # Logos are specified as a map with the url as key followed by height,width[,lang] as comma separated parameters. natsp.logos={\ - '${proxy-service.domain.prefix}/img/logo_full.png':'432,547',\ - '${proxy-service.domain.prefix}/img/logo_notext_h67.png':'279,278'\ + '${proxy-service.domain.prefix}/img/sc-logo-temporary.svg':'60,168',\ + '${proxy-service.domain.prefix}/img/sc-logo-temporary-notext.svg':'60,60'\ } natsp.assertionConsumerServices={\ 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/assertionconsumer'\ diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 02d16280..e7f7cfc1 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -574,7 +574,7 @@ md-eu1.qa.komreg.net: autoupdate: servicemonitor: eidas_proxy: - version: 1.1.4 + version: 1.1.5 hostname: proxy.eidas.swedenconnect.se sunet::frontend::register_sites: sites: @@ -624,7 +624,7 @@ md-eu1.qa.komreg.net: autoupdate: servicemonitor: eidas_proxy: - version: 1.1.4 + version: 1.1.5 hostname: qa.proxy.eidas.swedenconnect.se sunet::frontend::register_sites: sites: