Add Add godard-lvm-ssd volume to ganeti2

[mirror/dsa-puppet.git] / modules / ssl / manifests / service.pp

diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index f01a75c..069df0a 100644 (file)
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -12,18 +12,18 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = [], $key = fal
 
        file { "/etc/ssl/debian/certs/$name.crt":
                ensure => $ssl_ensure,
-               source => [ "puppet:///modules/ssl/servicecerts/${name}.crt", "puppet:///modules/ssl/from-letsencrypt/${name}.crt" ],
+               content => template('ssl/crt.erb'),
                notify => [ Exec['refresh_debian_hashes'], $notify ],
        }
        file { "/etc/ssl/debian/certs/$name.crt-chain":
                ensure => $ssl_ensure,
-               source => [ "puppet:///modules/ssl/chains/${name}.crt", "puppet:///modules/ssl/servicecerts/${name}.crt", "puppet:///modules/ssl/from-letsencrypt/${name}.crt-chain" ],
+               content => template('ssl/crt-chain.erb'),
                notify => [ $notify ],
                links  => follow,
        }
        file { "/etc/ssl/debian/certs/$name.crt-chained":
                ensure => $ssl_ensure,
-               content => template('ssl/chained.erb'),
+               content => template('ssl/crt-chained.erb'),
                notify => [ $notify ],
        }
        if $key {
@@ -31,7 +31,7 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = [], $key = fal
                        ensure => $ssl_ensure,
                        mode   => '0440',
                        group => 'ssl-cert',
-                       source => [ "puppet:///modules/ssl/keys/${name}.crt", "puppet:///modules/ssl/from-letsencrypt/${name}.key" ],
+                       content => template('ssl/key.erb'),
                        notify => [ $notify ],
                        links  => follow,
                }
@@ -48,9 +48,10 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = [], $key = fal
 
        if (size($tlsaports) > 0 and $ssl_ensure == "present") {
                $portlist = join($tlsaports, "-")
+               $certdir = hiera('paths.letsencrypt_dir')
                dnsextras::tlsa_record{ "tlsa-${name}-${portlist}":
                        zone     => 'debian.org',
-                       certfile => [ "/etc/puppet/modules/ssl/files/servicecerts/${name}.crt", "/etc/puppet/modules/ssl/files/from-letsencrypt/${name}.crt" ],
+                       certfile => [ "${certdir}/${name}.crt" ],
                        port     => $tlsaport,
                        hostname => "$name",
                }