Disable the usual SSL setup for godard

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

diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index 4f25a76..f01a75c 100644 (file)
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -1,4 +1,6 @@
 define ssl::service($ensure = present, $tlsaport = 443, $notify = [], $key = false) {
+       $tlsaports = any2array($tlsaport)
+
        if ($ensure == "ifstatic") {
                $ssl_ensure = has_static_component($name) ? {
                        true => "present",
@@ -33,10 +35,20 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = [], $key = fal
                        notify => [ $notify ],
                        links  => follow,
                }
+
+               file { "/etc/ssl/private/$name.key-certchain":
+                       ensure => $ssl_ensure,
+                       mode   => '0440',
+                       group => 'ssl-cert',
+                       content => template('ssl/key-chained.erb'),
+                       notify => [ $notify ],
+                       links  => follow,
+               }
        }
 
-       if ($tlsaport > 0 and $ssl_ensure == "present") {
-               dnsextras::tlsa_record{ "tlsa-${name}-${tlsaport}":
+       if (size($tlsaports) > 0 and $ssl_ensure == "present") {
+               $portlist = join($tlsaports, "-")
+               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" ],
                        port     => $tlsaport,