From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 15 Jul 2018 08:54:26 +0000 (+0200)
Subject: Use update-ca-certificates to update ca-global on stretch and later
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=cf928c1ad5a2d7666669a3697c4431c0b0a2fe2c

Use update-ca-certificates to update ca-global on stretch and later
---

diff --git a/modules/ssl/files/local-ssl-ca-global b/modules/ssl/files/local-ssl-ca-global
deleted file mode 100644
index 17aa6a862..000000000
--- a/modules/ssl/files/local-ssl-ca-global
+++ /dev/null
@@ -1,6 +0,0 @@
-DPkg::Pre-Install-Pkgs {
-  "if grep -q '/ca-certificates_.*\.deb$' ; then touch /run/dsa-ca-certificates-global ; fi";
-};
-DPkg::Post-Invoke {
-  "if [ -e /run/dsa-ca-certificates-global ] && [ -e /usr/local/sbin/update-ca-certificates-dsa ] ; then /usr/local/sbin/update-ca-certificates-dsa --fresh --default --certsconf /etc/ca-certificates-global.conf --etccertsdir /etc/ssl/ca-global --hooksdir /dev/null ; rm -f /run/dsa-ca-certificates-global ; fi";
-};
diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 73e805a63..21e51e614 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -37,7 +37,7 @@ class ssl {
 
 	file { '/etc/apt/apt.conf.d/local-ssl-ca-global':
 		mode   => '0444',
-		source => 'puppet:///modules/ssl/local-ssl-ca-global',
+		content => template('ssl/local-ssl-ca-global.erb'),
 	}
 
 	file { '/etc/ssl/certs/ssl-cert-snakeoil.pem':
diff --git a/modules/ssl/templates/local-ssl-ca-global.erb b/modules/ssl/templates/local-ssl-ca-global.erb
new file mode 100644
index 000000000..8d6a8f330
--- /dev/null
+++ b/modules/ssl/templates/local-ssl-ca-global.erb
@@ -0,0 +1,6 @@
+DPkg::Pre-Install-Pkgs {
+  "if grep -q '/ca-certificates_.*\.deb$' ; then touch /run/dsa-ca-certificates-global ; fi";
+};
+DPkg::Post-Invoke {
+  "if [ -e /run/dsa-ca-certificates-global ] && [ -e \"<?= @updatecacerts %>" ] ; then \"<?= @updatecacerts %>\" --fresh --default --certsconf /etc/ca-certificates-global.conf --etccertsdir /etc/ssl/ca-global --hooksdir /dev/null ; rm -f /run/dsa-ca-certificates-global ; fi";
+};