verglasz/soc-ops
0
0
Fork 0
forked from SUNET/soc-ops
Code Pull requests Activity

Bugifx

Browse source
This commit is contained in:
Johan Björklund 2025-01-22 13:22:22 +01:00
parent d5cf12c83b
commit dde5c82d29
Signed by untrusted user: bjorklund
GPG key ID: 5E8401339C7F5037
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/soc/manifests/satosa.pp
View file

@ -10,18 +10,18 @@ class soc::satosa(
Boolean $enable_oidc = false, Boolean $enable_oidc = false,
) { ) {
$certfile = undef
$certkey = undef
$certvol = undef
if ( $certprovider == 'dehydrated' ) { if ( $certprovider == 'dehydrated' ) {
$certfile = "/etc/dehydrated/certs/${certname}/fullchain.pem" $certfile = "/etc/dehydrated/certs/${certname}/fullchain.pem"
$certkey = "/etc/dehydrated/certs/${certname}.key" $certkey = "/etc/dehydrated/certs/${certname}.key"
$certvol = "/etc/dehydrated" $certvol = "/etc/dehydrated"
} elif ( $certprovider == 'certbot' ) { } elsif ( $certprovider == 'certbot' ) {
$certfile = "/etc/letsencrypt/live/${certname}/fullchain.pem" $certfile = "/etc/letsencrypt/live/${certname}/fullchain.pem"
$certkey = "/etc/letsencrypt/live/${certname}/privkey.pem" $certkey = "/etc/letsencrypt/live/${certname}/privkey.pem"
$certvol = "/etc/letsencrypt" $certvol = "/etc/letsencrypt"
} else {
$certfile = undef
$certkey = undef
$certvol = undef
} }
if ($::facts['sunet_satosa_exists'] == 'yes') { if ($::facts['sunet_satosa_exists'] == 'yes') {
@ -122,7 +122,7 @@ class soc::satosa(
} }
file { '/etc/satosa/https.key': ensure => link, target => "/etc/dehydrated/certs/${dehydrated_name}.key" } file { '/etc/satosa/https.key': ensure => link, target => "/etc/dehydrated/certs/${dehydrated_name}.key" }
file { '/etc/satosa/https.crt': ensure => link, target => "/etc/dehydrated/certs/${dehydrated_name}/fullchain.pem" } file { '/etc/satosa/https.crt': ensure => link, target => "/etc/dehydrated/certs/${dehydrated_name}/fullchain.pem" }
} elif ($certprovider == 'dehydrated') { } elsif ($certprovider == 'dehydrated') {
class { 'sunet::dehydrated::client': class { 'sunet::dehydrated::client':
domain => $certname, domain => $certname,
ssl_links => true, ssl_links => true,