From 80174ec18891d09b9cb20fccb58948400e3db6b4 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 23 Jun 2014 19:31:11 +0200
Subject: [PATCH] Move /etc/ssl/servicecerts to
 usr/local/share/ca-certificates/debian.org

---
 modules/samhain/templates/samhainrc.erb |  1 -
 modules/ssl/manifests/init.pp           | 26 +++++++++++--------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index aabfd768..47a0dd79 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -448,7 +448,6 @@ file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
 dir=1/etc/ssl/certs
-dir=1/etc/ssl/servicecerts
 file=/etc/unbound/unbound.conf
 <% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
 file=/etc/openvpn/deb-mgmt-clients.pool
diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index bc4ae9f0..270a3c0b 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -14,13 +14,21 @@ class ssl {
 	}
 
 	file { '/etc/ssl/servicecerts':
+		ensure   => link,
+		purge    => true,
+		force    => true,
+		target   => '/usr/local/share/ca-certificates/debian.org',
+		notify   => Exec['retire_debian_links'],
+	}
+
+	file { '/usr/local/share/ca-certificates/debian.org':
 		ensure   => directory,
 		source   => 'puppet:///modules/ssl/servicecerts/',
 		mode     => '0644', # this works; otherwise all files are +x
 		purge    => true,
 		recurse  => true,
 		force    => true,
-		notify   => Exec['refresh_debian_links'],
+		notify   => Exec['refresh_normal_hashes'],
 	}
 	file { '/etc/ssl/debian':
 		ensure   => directory,
@@ -72,23 +80,11 @@ class ssl {
 		require => Package['ssl-cert'],
 	}
 
-	exec { 'refresh_debian_links':
-		command     => 'cp -f -s ../servicecerts/* .',
+	exec { 'retire_debian_links':
+		command     => 'find -lname "../servicecerts/*" -exec rm {} +',
 		cwd         => '/etc/ssl/certs',
 		refreshonly => true,
-		notify      => Exec['delete_unused_links'],
-	}
-	exec { 'delete_unused_links':
-		command     => 'find -L . -mindepth 1 -maxdepth 1 -type l -delete',
-		cwd         => '/etc/ssl/certs',
-		refreshonly => true,
-		notify      => Exec['refresh_normal_hashes'], # see NOTE 1
-	}
-	exec { 'modify_configuration':
-		command     => "sed -i -e 's#!${cacert}#${cacert}#' ${caconf}",
-		onlyif      => "grep -Fqx '!${cacert}' ${caconf}",
 		notify      => Exec['refresh_normal_hashes'],
-		require     => Package['ca-certificates'],
 	}
 	exec { 'refresh_debian_hashes':
 		command     => 'c_rehash /etc/ssl/debian/certs',
-- 
2.39.2