santoro no longer is an old-style www mirror

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

diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index 0af2e16..a9d4fd4 100644 (file)
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -1,4 +1,4 @@
-define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
+define ssl::service($ensure = present, $tlsaport = 443, $notify = [], $key = false) {
        $link_target = $ensure ? {
                present => link,
                absent  => absent,
@@ -6,20 +6,33 @@ define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
        }
 
        file { "/etc/ssl/debian/certs/$name.crt":
-               source => "puppet:///modules/ssl/servicecerts/${name}.crt",
-               notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
+               source => [ "puppet:///modules/ssl/servicecerts/${name}.crt", "puppet:///modules/ssl/from-letsencrypt/${name}.crt" ],
+               notify => [ Exec['refresh_debian_hashes'], $notify ],
        }
        file { "/etc/ssl/debian/certs/$name.crt-chain":
-               source => [ "puppet:///modules/ssl/servicecerts/${name}.crt-chain",  "puppet:///modules/ssl/empty" ],
-               notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
-               links => follow,
+               source => [ "puppet:///modules/ssl/chains/${name}.crt", "puppet:///modules/ssl/servicecerts/${name}.crt", "puppet:///modules/ssl/from-letsencrypt/${name}.crt-chain" ],
+               notify => [ $notify ],
+               links  => follow,
+       }
+       file { "/etc/ssl/debian/certs/$name.crt-chained":
+               content => template('ssl/chained.erb'),
+               notify => [ $notify ],
+       }
+       if $key {
+               file { "/etc/ssl/private/$name.key":
+                       mode   => '0440',
+                       group => 'ssl-cert',
+                       source => [ "puppet:///modules/ssl/keys/${name}.crt", "puppet:///modules/ssl/from-letsencrypt/${name}.key" ],
+                       notify => [ $notify ],
+                       links  => follow,
+               }
        }
 
        if $tlsaport > 0 {
-               dnsextras::tlsa_record{ "tlsa-${tlsaport}":
-                       zone => 'debian.org',
-                       certfile => "/etc/puppet/modules/ssl/files/servicecerts/${name}.crt",
-                       port => $tlsaport,
+               dnsextras::tlsa_record{ "tlsa-${name}-${tlsaport}":
+                       zone     => 'debian.org',
+                       certfile => [ "/etc/puppet/modules/ssl/files/servicecerts/${name}.crt", "/etc/puppet/modules/ssl/files/from-letsencrypt/${name}.crt" ],
+                       port     => $tlsaport,
                        hostname => "$name",
                }
        }