From aa8b27c214baaadf20074044f8eb0e87ff77c141 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 2 May 2018 21:01:24 +0200
Subject: [PATCH] set correct hostname

---
 global/overlay/etc/puppet/cosmos-rules.yaml    |  2 ++
 .../etc/puppet/manifests/cosmos-site.pp        | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index db2fe2b4..25a94a06 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -84,6 +84,7 @@ md-eu1.qa.komreg.net:
    autoupdate:
    eidas_connector:
      version: 1.2.2
+     hostname: qa.connector.eidas.swedenconnect.se
    sunet::frontend::register_sites:
      sites:
        'qa.connector.eidas.swedenconnect.se':
@@ -100,6 +101,7 @@ md-eu1.qa.komreg.net:
    servicemonitor:
    eidas_proxy:
       version: 1.0.15
+      hostname: qa.proxy.eidas.swedenconnect.se
    sunet::frontend::register_sites:
      sites:
        'qa.proxy.eidas.swedenconnect.se':
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 04e2806a..69e1ea9e 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -206,9 +206,9 @@ class md_repo_server($hostname) {
    class {'https_server': }
 }
 
-class eidas_connector($version="1.0.6") {
+class eidas_connector($version="1.0.6",$hostname='localhost') {
    $_version = safe_hiera('eidas_connector_version',$version)
-   $hostname = safe_hiera('eidas_connector_hostname')
+   $_hostname = safe_hiera('eidas_connector_hostname',$hostname)
    $prid_service = safe_hiera('eidas_prid_service')
    $idp_fticks_salt = safe_hiera('idp_fticks_salt',NOT_SET);
    $idp_persistent_id_salt = safe_hiera('idp_persistent_id_salt',NOT_SET);
@@ -238,12 +238,12 @@ class eidas_connector($version="1.0.6") {
       volumes  => ['/var/log/eidas-connector:/var/log/eidas-connector',
                    '/etc/eidas-connector:/etc/eidas-connector',
                    '/etc/ssl:/etc/ssl'],
-      env      => ["IDP_SERVER_HOSTNAME=$hostname",
-                   "TOMCAT_HOSTNAME=localhost",
+      env      => ["IDP_SERVER_HOSTNAME=$_hostname",
+                   "TOMCAT_HOSTNAME=$_hostname",
                    "TOMCAT_PROXY_SHARED_SECRET=$proxy_header_secret",
                    "EIDAS_METADATA_IGNORE_SIGNATURE_VALIDATION=false",
-                   "IDP_ENTITY_ID=https://$hostname/eidas",
-                   "SP_ENTITY_ID=https://$hostname/idp/metadata/sp",
+                   "IDP_ENTITY_ID=https://$_hostname/eidas",
+                   "SP_ENTITY_ID=https://$_hostname/idp/metadata/sp",
                    "IDP_PERSISTENT_ID_SALT=$idp_persistent_id_salt",
                    "IDP_SEALER_PASSWORD=$idp_sealer_password",
                    "IDP_FTICKS_SALT=$idp_fticks_salt"]
@@ -252,9 +252,9 @@ class eidas_connector($version="1.0.6") {
    class {'https_server': }
 }
 
-class eidas_proxy($version='1.0.0',$country='se') {
+class eidas_proxy($version='1.0.0',$country='se',$hostname='localhost') {
    $_version = safe_hiera('eidas_proxy_version',$version)
-   $hostname = safe_hiera('eidas_proxy_hostname');
+   $_hostname = safe_hiera('eidas_proxy_hostname',$hostname);
    $_country = safe_hiera('eidas_proxy_country',$country);
    $proxy_service_cookie_encrypt_pw = safe_hiera('proxy_service_cookie_encrypt_pw',NOT_SET);
    file {['/etc/eidas-proxy/',"/etc/eidas-proxy/$_country"]: ensure => directory } ->
@@ -273,7 +273,7 @@ class eidas_proxy($version='1.0.0',$country='se') {
       volumes  => ['/var/log/eidas-proxy:/var/log/eidas-proxy',
                    '/etc/eidas-proxy:/etc/eidas-proxy',
                    '/etc/ssl:/etc/ssl'],
-      env      => ["PROXY_SERVICE_DOMAIN_PREFIX=https://$hostname/eidas-ps",
+      env      => ["PROXY_SERVICE_DOMAIN_PREFIX=https://$_hostname/eidas-ps",
                    "SPRING_PROFILES_ACTIVE=se",
                    "CERTNAME=${::fqdn}_infra",
                    "SPRING_CONFIG_LOCATION=/etc/eidas-proxy/$_country/cfg/",