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

Use proxy_directory variable for path references, SC-2522

Browse source
This commit is contained in:
Patrik Holmqvist 2025-02-04 16:32:51 +01:00
parent 0c28d470e1
commit 110df1ea73
Signed by: pahol
GPG key ID: 5D5B0D4E93F77273
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,23 +29,23 @@ class eid::proxy (
port => 443, port => 443,
} }
file { ['/etc/eidas-proxy/',"/etc/eidas-proxy/${country}"]: file { ["${proxy_directory}/","${proxy_directory}/${country}"]:
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
} }
file { "/etc/eidas-proxy/${country}/keystore": file { "${proxy_directory}/${country}/keystore":
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => 'root', owner => 'root',
group => 'root', group => 'root',
} }
sunet::snippets::secret_file {"/etc/eidas-proxy/${country}/metadata.p12": sunet::snippets::secret_file {"${proxy_directory}/${country}/metadata.p12":
hiera_key => 'eidas_metadata_key', hiera_key => 'eidas_metadata_key',
base64 => true base64 => true
} }
sunet::snippets::secret_file {"/etc/eidas-proxy/${country}/proxy.p12": sunet::snippets::secret_file {"${proxy_directory}/${country}/proxy.p12":
hiera_key => 'eidas_proxy_key', hiera_key => 'eidas_proxy_key',
base64 => true base64 => true
} }
@ -56,7 +56,7 @@ class eid::proxy (
group => 'root', group => 'root',
} }
if $eidas_proxy_oidc_rp_jks != '' { if $eidas_proxy_oidc_rp_jks != '' {
sunet::snippets::secret_file {"/etc/eidas-proxy/${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',
base64 => true base64 => true
} }
@ -71,7 +71,7 @@ class eid::proxy (
} }
sunet::nagios::nrpe_check_fileage {'proxy_eidas_metadata_cache': sunet::nagios::nrpe_check_fileage {'proxy_eidas_metadata_cache':
filename => '/etc/eidas-proxy/se/ps-mdcache/metadata-cache.xml', filename => "${proxy_directory}/se/ps-mdcache/metadata-cache.xml",
warning_age => '600', warning_age => '600',
critical_age => '172800' critical_age => '172800'
} }