X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fssl%2Fmanifests%2Fservice.pp;h=069df0a6fdcb3f254025cb8f08b6f26f6cb6db15;hb=9e27d3f0aaa21b93d9d256414dcd6335b07c0f53;hp=0af2e160733ab5a5bb6454129d57c3b926b6f5a8;hpb=2be83a39acf75d45f318fc07ce386a889a72f3e8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ssl/manifests/service.pp b/modules/ssl/manifests/service.pp
index 0af2e1607..069df0a6f 100644
--- a/modules/ssl/manifests/service.pp
+++ b/modules/ssl/manifests/service.pp
@@ -1,25 +1,58 @@
-define ssl::service($ensure = present, $tlsaport = 443, $notify = []) {
-	$link_target = $ensure ? {
-		present => link,
-		absent  => absent,
-		default => fail ( "Unknown ensure value: '$ensure'" ),
+define ssl::service($ensure = present, $tlsaport = 443, $notify = [], $key = false) {
+	$tlsaports = any2array($tlsaport)
+
+	if ($ensure == "ifstatic") {
+		$ssl_ensure = has_static_component($name) ? {
+			true => "present",
+			false => "absent"
+		}
+	} else {
+		$ssl_ensure = $ensure
 	}
 
 	file { "/etc/ssl/debian/certs/$name.crt":
-		source => "puppet:///modules/ssl/servicecerts/${name}.crt",
-		notify => [ Exec['c_rehash /etc/ssl/debian/certs'], $notify ],
+		ensure => $ssl_ensure,
+		content => template('ssl/crt.erb'),
+		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,
+		ensure => $ssl_ensure,
+		content => template('ssl/crt-chain.erb'),
+		notify => [ $notify ],
+		links  => follow,
+	}
+	file { "/etc/ssl/debian/certs/$name.crt-chained":
+		ensure => $ssl_ensure,
+		content => template('ssl/crt-chained.erb'),
+		notify => [ $notify ],
+	}
+	if $key {
+		file { "/etc/ssl/private/$name.key":
+			ensure => $ssl_ensure,
+			mode   => '0440',
+			group => 'ssl-cert',
+			content => template('ssl/key.erb'),
+			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 {
-		dnsextras::tlsa_record{ "tlsa-${tlsaport}":
-			zone => 'debian.org',
-			certfile => "/etc/puppet/modules/ssl/files/servicecerts/${name}.crt",
-			port => $tlsaport,
+	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 => [ "${certdir}/${name}.crt" ],
+			port     => $tlsaport,
 			hostname => "$name",
 		}
 	}