Make puppet-config a template

diff --git a/modules/apache2/files/puppet-config b/modules/apache2/files/puppet-config
deleted file mode 100644 (file)
index d754b12..0000000
--- 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 cb8d1d7..fba3b38 100644 (file)
--- 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 (file)
index 0000000..d754b12
--- /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>