projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fetch backups from bmdb1:debsources
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
630d845
..
9735570
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-16,6
+16,7
@@
class apache2 {
require => Package['apache2'],
}
require => Package['apache2'],
}
+ apache2::module { 'reqtimeout': }
apache2::module { 'info': }
apache2::module { 'status': }
apache2::module { 'headers': }
apache2::module { 'info': }
apache2::module { 'status': }
apache2::module { 'headers': }
@@
-93,7
+94,13
@@
class apache2 {
}
apache2::module { 'mpm_event': ensure => absent }
}
apache2::module { 'mpm_event': ensure => absent }
- apache2::module { 'mpm_worker': }
+ if has_role('apache_prefork') {
+ apache2::module { 'mpm_worker': ensure => absent }
+ apache2::module { 'mpm_prefork': }
+ } else {
+ apache2::module { 'mpm_prefork': ensure => absent }
+ apache2::module { 'mpm_worker': }
+ }
if $::lsbmajdistrelease > 7 {
file { '/etc/apache2/mods-available/mpm_worker.conf':
content => template('apache2/mpm_worker.erb'),
if $::lsbmajdistrelease > 7 {
file { '/etc/apache2/mods-available/mpm_worker.conf':
content => template('apache2/mpm_worker.erb'),