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

Change order of execution, SC-2522

Browse source
This commit is contained in:
Patrik Holmqvist 2025-02-04 16:51:09 +01:00
parent 23909ac9c6
commit e5d2b50da6
Signed by: pahol
GPG key ID: 5D5B0D4E93F77273
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
global/overlay/etc/puppet/modules/eid/manifests/proxy.pp
View file

@ -29,12 +29,14 @@ class eid::proxy (
port => 443, port => 443,
} }
file { "${proxy_directory}": sunet::docker_compose { 'eidas-proxy':
ensure => directory, content => template('eid/proxy/docker-compose.yml.erb'),
mode => '0755', service_name => 'eidas-proxy',
owner => 'root', compose_dir => '/opt/',
group => 'root', compose_filename => 'docker-compose.yml',
description => 'eidas proxy'
} }
file { "${proxy_directory}/${country}": file { "${proxy_directory}/${country}":
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
@ -55,12 +57,6 @@ class eid::proxy (
hiera_key => 'eidas_proxy_key', hiera_key => 'eidas_proxy_key',
base64 => true base64 => true
} }
file { ['/etc/luna','/etc/luna/cert']:
ensure => directory,
mode => '0755',
owner => 'root',
group => 'root',
}
if $eidas_proxy_oidc_rp_jks != '' { if $eidas_proxy_oidc_rp_jks != '' {
sunet::snippets::secret_file {"${proxy_directory}/${country}/keystore/oidc-rp.jks": sunet::snippets::secret_file {"${proxy_directory}/${country}/keystore/oidc-rp.jks":
hiera_key => 'eidas_proxy_oidc_rp_jks', hiera_key => 'eidas_proxy_oidc_rp_jks',
@ -68,12 +64,11 @@ class eid::proxy (
} }
} }
sunet::docker_compose { 'eidas-proxy': file { ['/etc/luna','/etc/luna/cert']:
content => template('eid/proxy/docker-compose.yml.erb'), ensure => directory,
service_name => 'eidas-proxy', mode => '0755',
compose_dir => '/opt/', owner => 'root',
compose_filename => 'docker-compose.yml', group => 'root',
description => 'eidas proxy'
} }
sunet::nagios::nrpe_check_fileage {'proxy_eidas_metadata_cache': sunet::nagios::nrpe_check_fileage {'proxy_eidas_metadata_cache':