From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 23 Sep 2016 19:54:11 +0000 (+0200)
Subject: puppet-ssl-key-pins.conf
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7313e43a892f670574ba83c165d15c8e2a0edf6f;p=mirror%2Fdsa-puppet.git

puppet-ssl-key-pins.conf
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index decec23e6..cc8573856 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -162,4 +162,12 @@ class apache2 {
 		refreshonly => true,
 		require =>  Package['apache2'],
 	}
+
+	concat { '/etc/apache2/conf-available/puppet-ssl-key-pins.conf':
+		owner   => root,
+		group   => root,
+		mode    => '0644',
+		require =>  Package['apache2'],
+	}
+	apache2::config { 'puppet-ssl-key-pins': }
 }