From 4a12d81e52313624b93f8832f42d5ccdd71087d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Fri, 24 Aug 2018 13:11:16 +0200 Subject: [PATCH] changed eidas-test to prod environment --- global/overlay/etc/puppet/cosmos-rules.yaml | 1 + global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 61f0f174..4f0bb28b 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -521,6 +521,7 @@ md-eu1.qa.komreg.net: eidas_sp: version: 1.0.0 hostname: test.swedenconnect.se + environment: prod sunet::frontend::register_sites: sites: 'test.swedenconnect.se': diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 08f685b1..19a4e4f7 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -250,7 +250,7 @@ class md_repo_server($hostname) { ensure_resource('class','https_server',{}) } -class eidas_sp($version="1.0.0",$hostname='localhost') { +class eidas_sp($version="1.0.0",$hostname='localhost',$environment='qa') { $_version = safe_hiera('eidas_sp_version',$version) $_hostname = safe_hiera('eidas_sp_hostname',$hostname) file {['/etc/eidas-sp','/var/log/eidas-sp','/etc/ssl']: ensure => directory } -> @@ -266,7 +266,7 @@ class eidas_sp($version="1.0.0",$hostname='localhost') { env => ["SERVER_SERVLET_CONTEXT_PATH=/", "SP_USE_SC_LOGO=false", "SP_ENTITY_ID=https://$_hostname/sp", - "SPRING_PROFILES_ACTIVE=qa", + "SPRING_PROFILES_ACTIVE=$environment", "SP_BASE_URI=https://$_hostname"] } ensure_resource('class','webserver',{})