X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=fba3b38905b67a79bf0197ba63b6c42d5b60463f;hb=d8092dac8d43bc6d789c26cf7e1862d5464e9b39;hp=b1f20a23920249a3371c224ba6b7ea14e0e7d646;hpb=38f0083b85b5d13dab37476938098a48136f29f7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b1f20a239..fba3b3890 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -79,6 +79,20 @@ class apache2 {
 		source => 'puppet:///modules/apache2/puppet-ssl-macros',
 	}
 
+	apache2::config { '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':
+			source => 'puppet:///modules/apache2/mpm_worker',
+		}
+	}
+
 	file { '/etc/apache2/sites-available/common-ssl.inc':
 		ensure => absent,
 	}