From c527adb91e99befcd146e84acd66386bf96c3be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= <bjorklund@sunet.se>
Date: Thu, 31 Oct 2024 08:58:04 +0100
Subject: [PATCH] Fix logic and spelling.

---
 global/overlay/etc/puppet/modules/soc/manifests/satosa.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/global/overlay/etc/puppet/modules/soc/manifests/satosa.pp b/global/overlay/etc/puppet/modules/soc/manifests/satosa.pp
index 24b2650..c508766 100644
--- a/global/overlay/etc/puppet/modules/soc/manifests/satosa.pp
+++ b/global/overlay/etc/puppet/modules/soc/manifests/satosa.pp
@@ -101,9 +101,6 @@ class sunet::satosa(
         allow_clients => 'any',
         port          => 80,
       }
-    } elseif ($ext_cert) and ($ext_cert_key) {
-      file { '/etc/satosa/https.key': ensure => link, target => $ext_cert_key }
-      file { '/etc/satosa/https.crt': ensure => link, target => $ext_cert }
     } else {
       sunet::misc::ufw_allow { 'allow-http':
         from => 'any',
@@ -112,6 +109,9 @@ class sunet::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" }
+  } elsif ($ext_cert) and ($ext_cert_key) {
+      file { '/etc/satosa/https.key': ensure => link, target => $ext_cert_key }
+      file { '/etc/satosa/https.crt': ensure => link, target => $ext_cert }
   } else {
     sunet::snippets::keygen {'satosa_https':
       key_file  => '/etc/satosa/https.key',