From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 24 May 2015 07:44:15 +0000 (+0200)
Subject: Make puppet-config a template
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0682e93d315d687ec13b0b6ec80f28c231628303;p=mirror%2Fdsa-puppet.git

Make puppet-config a template
---

diff --git a/modules/apache2/files/puppet-config b/modules/apache2/files/puppet-config
deleted file mode 100644
index d754b1241..000000000
--- a/modules/apache2/files/puppet-config
+++ /dev/null
@@ -1,8 +0,0 @@
-<IfModule mod_ssl.c>
-  SSLProtocol all -SSLv2 -SSLv3
-  SSLHonorCipherOrder On
-
-  # this is a list that seems suitable as of 2014-10, when running wheezy.  It
-  # probably requires re-visiting regularly.
-  SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!eNULL:!LOW:!MD5:!EXP:!RC4:!SEED:!DSS
-</IfModule>
diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index cb8d1d7a9..fba3b3890 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -80,7 +80,7 @@ class apache2 {
 	}
 
 	apache2::config { 'puppet-config':
-		source => 'puppet:///modules/apache2/puppet-config',
+		content => template('apache2/puppet-config.erb'),
 	}
 
 	apache2::config { 'pratchett':
diff --git a/modules/apache2/templates/puppet-config.erb b/modules/apache2/templates/puppet-config.erb
new file mode 100644
index 000000000..d754b1241
--- /dev/null
+++ b/modules/apache2/templates/puppet-config.erb
@@ -0,0 +1,8 @@
+<IfModule mod_ssl.c>
+  SSLProtocol all -SSLv2 -SSLv3
+  SSLHonorCipherOrder On
+
+  # this is a list that seems suitable as of 2014-10, when running wheezy.  It
+  # probably requires re-visiting regularly.
+  SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!eNULL:!LOW:!MD5:!EXP:!RC4:!SEED:!DSS
+</IfModule>