X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Fmanifests%2Finit.pp;h=cb8d1d7a9efadc9e8352f78d0433ed621bfecc70;hb=767498dfd5063c8c951a131426796c0d3d3bfb6c;hp=a475f63ce4805ec240cf16afbf0006004f6d4d22;hpb=86777266162465bdecda9e835fa79171368046e1;p=dsa-puppet.git diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index a475f63c..cb8d1d7a 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,20 @@ class apache2 { ensure => absent, } + 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 * 1024 + } + apache2::config { 'resource-limits': content => template('apache2/resource-limits.erb'), } @@ -52,6 +75,24 @@ class apache2 { source => 'puppet:///modules/apache2/server-status', } + apache2::config { 'puppet-ssl-macros': + source => 'puppet:///modules/apache2/puppet-ssl-macros', + } + + apache2::config { 'puppet-config': + source => 'puppet:///modules/apache2/puppet-config', + } + + 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, } @@ -69,6 +110,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': }