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

Fix logic and spelling.

Browse source
This commit is contained in:
Johan Björklund 2024-10-31 08:58:04 +01:00
parent ddc22ad91c
commit c527adb91e
Signed by untrusted user: bjorklund
GPG key ID: 5E8401339C7F5037
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
global/overlay/etc/puppet/modules/soc/manifests/satosa.pp
View file

@ -101,9 +101,6 @@ class sunet::satosa(
allow_clients => 'any', allow_clients => 'any',
port => 80, 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 { } else {
sunet::misc::ufw_allow { 'allow-http': sunet::misc::ufw_allow { 'allow-http':
from => 'any', 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.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" }
} 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 { } else {
sunet::snippets::keygen {'satosa_https': sunet::snippets::keygen {'satosa_https':
key_file => '/etc/satosa/https.key', key_file => '/etc/satosa/https.key',