From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 23 Sep 2016 19:57:30 +0000 (+0200)
Subject: puppet-ssl-key-pins.conf is a concat, cannot set it as source/content
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0c38e9ade1c7b7730d6c72bee16abf10a74c4238;p=mirror%2Fdsa-puppet.git

puppet-ssl-key-pins.conf is a concat, cannot set it as source/content
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index cc8573856..3f854a7c0 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -169,5 +169,7 @@ class apache2 {
 		mode    => '0644',
 		require =>  Package['apache2'],
 	}
-	apache2::config { 'puppet-ssl-key-pins': }
+	apache2::config { 'puppet-ssl-key-pins':
+		nocontentok => true,
+	}
 }