From aadf158cb5436c0e2ff03f996799e32bc9f2f9df Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 19 Dec 2017 13:43:05 +0100
Subject: [PATCH] switch to se

---
 .../overlay/etc/hiera/data/local.yaml              |  4 ++--
 global/overlay/etc/puppet/manifests/cosmos-site.pp | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eidas-proxy-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml b/eidas-proxy-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml
index 6a287478..7e1c3932 100644
--- a/eidas-proxy-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml
+++ b/eidas-proxy-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml
@@ -1,3 +1,3 @@
 ---
-eidas_proxy_hostname: xy.proxy.qa.sveidas.se
-eidas_proxy_country: xy
+eidas_proxy_hostname: se.proxy.qa.sveidas.se
+eidas_proxy_country: se
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 7f97c754..a8ea9614 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -223,21 +223,21 @@ class eidas_connector($version="1.0.6") {
    class {'https_server': }
 }
 
-class eidas_proxy($version='1.0.0') {
+class eidas_proxy($version='1.0.0',$country='se') {
    $_version = safe_hiera('eidas_proxy_version',$version)
    $hostname = safe_hiera('eidas_proxy_hostname');
-   $country = safe_hiera('eidas_proxy_country');
+   $_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 } ->
-   sunet::snippets::secret_file {"/etc/eidas-proxy/$country/metadata.p12":
+   file {['/etc/eidas-proxy/',"/etc/eidas-proxy/$_country"]: ensure => directory } ->
+   sunet::snippets::secret_file {"/etc/eidas-proxy/$_country/metadata.p12":
       hiera_key => 'eidas_metadata_key',
       base64    => true
    } ->
-   sunet::snippets::secret_file {"/etc/eidas-proxy/$country/proxy.p12":
+   sunet::snippets::secret_file {"/etc/eidas-proxy/$_country/proxy.p12":
       hiera_key => 'eidas_proxy_key',
       base64    => true
    } ->
-   sunet::snippets::secret_file {"/etc/eidas-proxy/$country/nodeKeyStore.jks":
+   sunet::snippets::secret_file {"/etc/eidas-proxy/$_country/nodeKeyStore.jks":
       hiera_key => 'eidas_proxy_keystore',
       base64    => true
    } ->
@@ -251,7 +251,7 @@ class eidas_proxy($version='1.0.0') {
       env      => ["PROXY_SERVICE_DOMAIN_PREFIX=https://$hostname/eidas-ps",
                    "SPRING_PROFILES_ACTIVE=se",
                    "CERTNAME=${::fqdn}_infra",
-                   "SPRING_CONFIG_LOCATION=/etc/eidas-proxy/$country/cfg/",
+                   "SPRING_CONFIG_LOCATION=/etc/eidas-proxy/$_country/cfg/",
                    "PROXY_SERVICE_COOKIEENCRYPTPW=$proxy_service_cookie_encrypt_pw"]
    } ->
    class {'webserver': } ->