diff --git a/manifests/ssl.pp b/manifests/ssl.pp index 07e1c8b9..cabcd652 100644 --- a/manifests/ssl.pp +++ b/manifests/ssl.pp @@ -1,54 +1,54 @@ # Deploy SSL certificates class profile::ssl { $public_dir = '/etc/ssl/certs/softwareheritage' $private_dir = '/etc/ssl/private/softwareheritage' $ssl_certificates = hiera_hash('ssl') $cert_domains = keys($ssl_certificates) # Generate {'foo' => "${public_dir}/foo.crt"} from ['foo'] $certificate_paths = hash(flatten(zip($cert_domains, prefix(suffix($cert_domains, '.crt'), "${public_dir}/")))) $ca_paths = hash(flatten(zip($cert_domains, prefix(suffix($cert_domains, '.ca'), "${public_dir}/")))) $private_key_paths = hash(flatten(zip($cert_domains, prefix(suffix($cert_domains, '.key'), "${private_dir}/")))) file {$public_dir: ensure => 'directory', owner => 'root', group => 'root', mode => '0644', } file {$private_dir: ensure => 'directory', owner => 'root', group => 'root', mode => '0600', } each($ssl_certificates) |$domain, $data| { file {$certificate_paths[$domain]: ensure => present, owner => 'root', group => 'root', mode => '0644', content => $data['certificate'], } file {$ca_paths[$domain]: ensure => present, owner => 'root', group => 'root', mode => '0644', - content => $data['ca'], + content => $data['ca_bundle'], } file {$private_key_paths[$domain]: ensure => present, owner => 'root', group => 'root', mode => '0600', content => $data['private_key'], } } }