X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=3f854a7c0674412b2dcc46472224a269c9249aba;hb=0c38e9ade1c7b7730d6c72bee16abf10a74c4238;hp=decec23e68ff61e06cf50032fa8e6ac264603a9a;hpb=b98ca19d555504c1b3909da4b2680e0041d7dd3e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index decec23e6..3f854a7c0 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -162,4 +162,14 @@ 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':
+		nocontentok => true,
+	}
 }