From dde5c82d29b02dbfd15a098e734759fa498fb8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= Date: Wed, 22 Jan 2025 13:22:22 +0100 Subject: [PATCH] Bugifx --- .../etc/puppet/modules/soc/manifests/satosa.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/global/overlay/etc/puppet/modules/soc/manifests/satosa.pp b/global/overlay/etc/puppet/modules/soc/manifests/satosa.pp index 82e0f70..1c42883 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/satosa.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/satosa.pp @@ -10,18 +10,18 @@ class soc::satosa( Boolean $enable_oidc = false, ) { - $certfile = undef - $certkey = undef - $certvol = undef - if ( $certprovider == 'dehydrated' ) { $certfile = "/etc/dehydrated/certs/${certname}/fullchain.pem" $certkey = "/etc/dehydrated/certs/${certname}.key" $certvol = "/etc/dehydrated" - } elif ( $certprovider == 'certbot' ) { + } elsif ( $certprovider == 'certbot' ) { $certfile = "/etc/letsencrypt/live/${certname}/fullchain.pem" $certkey = "/etc/letsencrypt/live/${certname}/privkey.pem" $certvol = "/etc/letsencrypt" + } else { + $certfile = undef + $certkey = undef + $certvol = undef } 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.crt': ensure => link, target => "/etc/dehydrated/certs/${dehydrated_name}/fullchain.pem" } - } elif ($certprovider == 'dehydrated') { + } elsif ($certprovider == 'dehydrated') { class { 'sunet::dehydrated::client': domain => $certname, ssl_links => true,