X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=0470b644b5fe0751c9b5ef8d7442a9e77c70c475;hb=5efc285f2986f21e78be720e31160a7a818cc5ee;hp=03976954d28cd52d1facfd61ff79238faaaa2c13;hpb=28d5e073803e59886b39b0acfa8484b97a855da4;p=mirror%2Fdsa-puppet.git diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index 03976954d..0470b644b 100644 --- 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, @@ -10,6 +18,7 @@ class apache2 { apache2::module { 'info': } apache2::module { 'status': } + apache2::module { 'headers': } package { 'libapache2-mod-macro': ensure => installed @@ -32,6 +41,18 @@ class apache2 { ensure => absent, } + if has_role('buildd_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 * 1024 + } + apache2::config { 'resource-limits': content => template('apache2/resource-limits.erb'), } @@ -73,6 +94,11 @@ class apache2 { content => template('apache2/default-index.html'), } + file { '/var/log/apache2/.nobackup': + mode => '0644', + content => '', + } + munin::check { 'apache_accesses': } munin::check { 'apache_processes': } munin::check { 'apache_volume': }