From: Paul Wise <pabs@debian.org>
Date: Thu, 6 Apr 2017 01:55:12 +0000 (+0800)
Subject: Use standard update-ca-certificates on stretch and later
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=873bf0daa4bbf79d86073a4427f5aef8dc4f6739;p=mirror%2Fdsa-puppet.git

Use standard update-ca-certificates on stretch and later

The changes in update-ca-certificates-dsa got merged in stretch ca-certificates.
---

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 9e900bec1..dc11e9777 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -131,9 +131,18 @@ class ssl {
 		require => Package['ssl-cert'],
 	}
 
-	file { '/usr/local/sbin/update-ca-certificates-dsa':
-		mode   => '0555',
-		source => 'puppet:///modules/ssl/update-ca-certificates-dsa',
+	$updatecacertsdsa = '/usr/local/sbin/update-ca-certificates-dsa'
+	if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+		file { $updatecacertsdsa:
+			ensure => absent,
+		}
+		$updatecacerts = '/usr/sbin/update-ca-certificates'
+	} else {
+		file { $updatecacertsdsa:
+			mode   => '0555',
+			source => 'puppet:///modules/ssl/update-ca-certificates-dsa',
+		}
+		$updatecacerts = $updatecacertsdsa
 	}
 
 	exec { 'retire_debian_links':
@@ -158,23 +167,23 @@ class ssl {
 		require     => Package['ca-certificates'],
 	}
 	exec { 'refresh_ca_debian_hashes':
-		command     => '/usr/local/sbin/update-ca-certificates-dsa --fresh --certsconf /etc/ca-certificates-debian.conf --localcertsdir /dev/null --etccertsdir /etc/ssl/ca-debian --hooksdir /dev/null',
+		command     => "${updatecacerts} --fresh --certsconf /etc/ca-certificates-debian.conf --localcertsdir /dev/null --etccertsdir /etc/ssl/ca-debian --hooksdir /dev/null",
 		refreshonly => true,
 		require     => [
 			Package['ca-certificates'],
 			File['/etc/ssl/ca-debian'],
 			File['/etc/ca-certificates-debian.conf'],
-			File['/usr/local/sbin/update-ca-certificates-dsa'],
+			File[$updatecacerts],
 		]
 	}
 	exec { 'refresh_ca_global_hashes':
-		command     => '/usr/local/sbin/update-ca-certificates-dsa --fresh --default --certsconf /etc/ca-certificates-global.conf --etccertsdir /etc/ssl/ca-global --hooksdir /dev/null',
+		command     => "${updatecacerts} --fresh --default --certsconf /etc/ca-certificates-global.conf --etccertsdir /etc/ssl/ca-global --hooksdir /dev/null",
 		refreshonly => true,
 		require     => [
 			Package['ca-certificates'],
 			File['/etc/ssl/ca-global'],
 			File['/etc/ca-certificates-global.conf'],
-			File['/usr/local/sbin/update-ca-certificates-dsa'],
+			File[$updatecacerts],
 		]
 	}