From: Paul Wise <pabs@debian.org>
Date: Wed, 7 Jan 2015 07:06:52 +0000 (+0800)
Subject: The snakeoil key is handled by puppet also.
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bb4e16958b66da1e20a831ee0d2f0696c9428c95;p=mirror%2Fdsa-puppet.git

The snakeoil key is handled by puppet also.
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 2758d4676..317320293 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -458,6 +458,7 @@ dir=1/etc/ssl/ca-global
 file=/etc/ca-certificates.conf
 file=/etc/ca-certificates-debian.conf
 file=/etc/ca-certificates-global.conf
+file=/etc/ssl/private/ssl-cert-snakeoil.key
 file=/etc/unbound/unbound.conf
 <% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
 file=/etc/openvpn/deb-mgmt-clients.pool