fix templating fu

[mirror/dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 8d0ffdf..008dab8 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -80,13 +80,19 @@ class apache2 {
        }
 
        apache2::config { 'puppet-config':
-               source => 'puppet:///modules/apache2/puppet-config',
+               content => template('apache2/puppet-config.erb'),
        }
 
        apache2::config { 'pratchett':
                source => 'puppet:///modules/apache2/pratchett',
        }
 
+       if $::lsbmajdistrelease > 7 {
+               file { '/etc/apache2/mods-available/mpm_worker.conf':
+                       content => template('apache2/mpm_worker.erb'),
+               }
+       }
+
        file { '/etc/apache2/sites-available/common-ssl.inc':
                ensure => absent,
        }