From a719316e6930e3a7d60096ae67d442e31c1a8288 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 4 Sep 2018 11:37:50 +0200
Subject: [PATCH] public hostnames and infra cert

---
 .../overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh | 2 +-
 global/overlay/etc/puppet/manifests/cosmos-site.pp             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
index d966407b..a99c7daf 100755
--- a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
+++ b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
@@ -5,7 +5,7 @@ set -x
 cat<<EOF
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <CoreConfiguration xmlns="http:/www.bos_bremen.de/2009/06/eID-Server-CoreConfig">
-    <ServerUrl>https://${CERTNAME}/eidas-middleware</ServerUrl>
+    <ServerUrl>https://${PUBLIC_HOSTNAME}/eidas-middleware</ServerUrl>
     <sessionManagerUsesDatabase>true</sessionManagerUsesDatabase>
     <sessionMaxPendingRequests>500</sessionMaxPendingRequests>
     <certificateWarningMargin>200</certificateWarningMargin>
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 518d2269..d5219b52 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -276,7 +276,8 @@ class eidas_de_middleware($version="106-rs",$hostname='localhost') {
                    '/opt/eidas-middleware/database:/opt/eidas-middleware/database',
                    '/dev/log:/dev/log',
                    '/etc/ssl:/etc/ssl'],
-      env      => ["CERTNAME=$_hostname",
+      env      => ["CERTNAME=${::fqdn}_infra",
+                   "PUBLIC_HOSTNAME=$_hostname",
                    "POSEIDAS_ADMIN_HASHED_PASSWORD=$poseidas_admin_hashed_password",
                    "SPRING_DATASOURCE_PASSWORD=$spring_datasource_password",
                    "MIDDLEWARE_CRYPT_PIN=$middleware_crypt_pin",