swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

set correct hostname

Browse source
This commit is contained in:
Leif Johansson 2018-05-02 21:01:24 +02:00
parent e674ad5ad7
commit aa8b27c214
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -84,6 +84,7 @@ md-eu1.qa.komreg.net:
autoupdate: autoupdate:
eidas_connector: eidas_connector:
version: 1.2.2 version: 1.2.2
hostname: qa.connector.eidas.swedenconnect.se
sunet::frontend::register_sites: sunet::frontend::register_sites:
sites: sites:
'qa.connector.eidas.swedenconnect.se': 'qa.connector.eidas.swedenconnect.se':
@ -100,6 +101,7 @@ md-eu1.qa.komreg.net:
servicemonitor: servicemonitor:
eidas_proxy: eidas_proxy:
version: 1.0.15 version: 1.0.15
hostname: qa.proxy.eidas.swedenconnect.se
sunet::frontend::register_sites: sunet::frontend::register_sites:
sites: sites:
'qa.proxy.eidas.swedenconnect.se': 'qa.proxy.eidas.swedenconnect.se':

18
global/overlay/etc/puppet/manifests/cosmos-site.pp
View file

@ -206,9 +206,9 @@ class md_repo_server($hostname) {
class {'https_server': } 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) $_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') $prid_service = safe_hiera('eidas_prid_service')
$idp_fticks_salt = safe_hiera('idp_fticks_salt',NOT_SET); $idp_fticks_salt = safe_hiera('idp_fticks_salt',NOT_SET);
$idp_persistent_id_salt = safe_hiera('idp_persistent_id_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', volumes => ['/var/log/eidas-connector:/var/log/eidas-connector',
'/etc/eidas-connector:/etc/eidas-connector', '/etc/eidas-connector:/etc/eidas-connector',
'/etc/ssl:/etc/ssl'], '/etc/ssl:/etc/ssl'],
env => ["IDP_SERVER_HOSTNAME=$hostname", env => ["IDP_SERVER_HOSTNAME=$_hostname",
"TOMCAT_HOSTNAME=localhost", "TOMCAT_HOSTNAME=$_hostname",
"TOMCAT_PROXY_SHARED_SECRET=$proxy_header_secret", "TOMCAT_PROXY_SHARED_SECRET=$proxy_header_secret",
"EIDAS_METADATA_IGNORE_SIGNATURE_VALIDATION=false", "EIDAS_METADATA_IGNORE_SIGNATURE_VALIDATION=false",
"IDP_ENTITY_ID=https://$hostname/eidas", "IDP_ENTITY_ID=https://$_hostname/eidas",
"SP_ENTITY_ID=https://$hostname/idp/metadata/sp", "SP_ENTITY_ID=https://$_hostname/idp/metadata/sp",
"IDP_PERSISTENT_ID_SALT=$idp_persistent_id_salt", "IDP_PERSISTENT_ID_SALT=$idp_persistent_id_salt",
"IDP_SEALER_PASSWORD=$idp_sealer_password", "IDP_SEALER_PASSWORD=$idp_sealer_password",
"IDP_FTICKS_SALT=$idp_fticks_salt"] "IDP_FTICKS_SALT=$idp_fticks_salt"]
@ -252,9 +252,9 @@ class eidas_connector($version="1.0.6") {
class {'https_server': } 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) $_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); $_country = safe_hiera('eidas_proxy_country',$country);
$proxy_service_cookie_encrypt_pw = safe_hiera('proxy_service_cookie_encrypt_pw',NOT_SET); $proxy_service_cookie_encrypt_pw = safe_hiera('proxy_service_cookie_encrypt_pw',NOT_SET);
file {['/etc/eidas-proxy/',"/etc/eidas-proxy/$_country"]: ensure => directory } -> 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', volumes => ['/var/log/eidas-proxy:/var/log/eidas-proxy',
'/etc/eidas-proxy:/etc/eidas-proxy', '/etc/eidas-proxy:/etc/eidas-proxy',
'/etc/ssl:/etc/ssl'], '/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", "SPRING_PROFILES_ACTIVE=se",
"CERTNAME=${::fqdn}_infra", "CERTNAME=${::fqdn}_infra",
"SPRING_CONFIG_LOCATION=/etc/eidas-proxy/$_country/cfg/", "SPRING_CONFIG_LOCATION=/etc/eidas-proxy/$_country/cfg/",