sibelius needs more RAM for git-http-backend

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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index ae9f89487b0209c88656512f2768b9047c118d7c..67e6b8bad288a357e84d029bd998e569648a75a5 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,
@@ -29,10 +37,26 @@ class apache2 {
                ensure => absent,
        }
 
+       apache2::config { 'serve-cgi-bin':
+               ensure => absent,
+       }
+
        apache2::config { 'ressource-limits':
                ensure => absent,
        }
 
+       if has_role('udd') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('sso') {
+               $memlimit = 512 * 1024 * 1024
+       } elsif has_role('qamaster') {
+               $memlimit = 300 * 1024 * 1024
+       } elsif has_role('snapshot_master') {
+               $memlimit = 300 * 1024 * 1024
+       } else {
+               $memlimit = 192 * 1024 * 1024
+       }
+
        apache2::config { 'resource-limits':
                content => template('apache2/resource-limits.erb'),
        }
@@ -57,6 +81,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.erb'),
+               }
+       }
+
        file { '/etc/apache2/sites-available/common-ssl.inc':
                ensure => absent,
        }