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 dcfe3788..8a090155 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,7 +1,13 @@ psgen.country=${proxy-service.country} psgen.name=Sweden eIDAS ProxyService -psgen.orgName=Sweden Connect -psgen.dispName=Swedish eIDAS Proxy Service +psgen.orgName={\ + en:'Sweden Connect',\ + sv:'Sweden Connect'\ +} +psgen.dispName={\ + en:'Swedish eIDAS Proxy Service',\ + sv:'Swedish eIDAS Proxy Service'\ +} psgen.orgUrl=https://swedenconnect.se psgen.supportGivenName=Customer support psgen.techGivenName=Technical support 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 a098e7fa..03cca74a 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 @@ -1,5 +1,10 @@ #EntityID of the n natsp.entityId=${proxy-service.domain.prefix}/nat-ps-sp +# 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}/image/logo.svg':'60,171',\ + '${proxy-service.domain.prefix}/image/icon.svg':'32,32'\ + } natsp.displayNames={\ en:'Swedish Citizen Adapter',\ sv:'Sveriges internationella legitimeringsnod'\ @@ -8,11 +13,6 @@ natsp.descriptions={\ en:'Swedish eIDAS Service',\ sv:'Svenska eIDAS Tjänsten'\ } -# 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}/image/logo.svg':'60,171',\ - '${proxy-service.domain.prefix}/image/icon.svg':'32,32'\ - } 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 7a277fd6..94f72278 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -716,8 +716,9 @@ md-eu1.qa.komreg.net: autoupdate: servicemonitor: eidas_proxy: - version: 1.1.15 + version: 1.3.4 hostname: proxy.eidas.swedenconnect.se + spring_config_param: SPRING_CONFIG_ADDITIONAL_LOCATION sunet::frontend::register_sites: sites: 'proxy.eidas.swedenconnect.se':