From c2171396150054eec090021f29cfaa39629b9d2e Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@nordu.net>
Date: Mon, 26 Nov 2018 15:53:29 +0100
Subject: [PATCH] Upgrade proxy to 1.1.15 in production and connector to 1.5.0.

---
 .../overlay/etc/eidas-proxy/se/cfg/application.properties     | 3 +++
 .../overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties  | 4 ++--
 global/overlay/etc/puppet/cosmos-rules.yaml                   | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
index 603445a1..2c65fe11 100644
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/application.properties
@@ -7,6 +7,9 @@ server.context-path=/eidas-ps
 proxy-service.path.prefix=${spring.config.location}..
 proxy-service.config.location=file://${spring.config.location}
 
+proxy-service.image.logo=${spring.config.location}/img/sweden-connect-color-yellow-on-blue.svg
+proxy-service.image.icon=${spring.config.location}/img/sweden-connect-color-yellow-on-blue-no-text.svg
+
 # Service port connector settings
 server.port=8443
 #server.ssl.key-store=${proxy-service.path.prefix}/keystore/sslSnakeOil.p12
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 6487baf6..a098e7fa 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/sc-logo-temporary.svg':'60,168',\
-  '${proxy-service.domain.prefix}/img/sc-logo-temporary-notext.svg':'60,60'\
+  '${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 ec973aeb..c60a6b1f 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -629,7 +629,7 @@ md-eu1.qa.komreg.net:
    konsulter:
    autoupdate:
    eidas_connector:
-     version: 1.3.8
+     version: 1.5.0
      hostname: connector.eidas.swedenconnect.se
    sunet::frontend::register_sites:
      sites:
@@ -654,7 +654,7 @@ md-eu1.qa.komreg.net:
    autoupdate:
    servicemonitor:
    eidas_proxy:
-      version: 1.1.10
+      version: 1.1.15
       hostname: proxy.eidas.swedenconnect.se
    sunet::frontend::register_sites:
      sites: