Make mpm_worker config into a template

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index b14d408..66ee3df 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: apache2
+#
+# Standard apache config debian.org hosts
+#
+# == Sample Usage:
+#
+#   include apache2
+#
 class apache2 {
        package { 'apache2':
                ensure => installed,
@@ -33,14 +41,18 @@ class apache2 {
                ensure => absent,
        }
 
-       if $::fqdn in $site::roles['buildd_master'] {
-               $memlimit = 192 * 1024**2
-       } elsif $::fqdn in $site::roles['nagiosmaster']{
-               $memlimit = 96 * 1024**2
-       } elsif $::fqdn in $site::roles['packagesqamaster']{
-               $memlimit = 192 * 1024**2
+       if has_role('buildd_master') {
+               $memlimit = 192 * 1024 * 1024
+       } elsif has_role('buildd_ports_master') {
+               $memlimit = 192 * 1024 * 1024
+       } elsif has_role('nagiosmaster') {
+               $memlimit = 96 * 1024 * 1024
+       } elsif has_role('packagesqamaster') {
+               $memlimit = 192 * 1024 * 1024
+       } elsif has_role('nm') {
+               $memlimit = 96 * 1024 * 1024
        } else {
-               $memlimit = 32 * 1024**2
+               $memlimit = 32 * 1024 * 1024
        }
 
        apache2::config { 'resource-limits':
@@ -67,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':
+                       content => template('apache2/mpm_worker'),
+               }
+       }
+
        file { '/etc/apache2/sites-available/common-ssl.inc':
                ensure => absent,
        }