projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try a larger memlimit on sso
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
fba3b38
..
9024243
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-37,6
+37,10
@@
class apache2 {
ensure => absent,
}
ensure => absent,
}
+ apache2::config { 'serve-cgi-bin':
+ ensure => absent,
+ }
+
apache2::config { 'ressource-limits':
ensure => absent,
}
apache2::config { 'ressource-limits':
ensure => absent,
}
@@
-51,8
+55,12
@@
class apache2 {
$memlimit = 192 * 1024 * 1024
} elsif has_role('nm') {
$memlimit = 96 * 1024 * 1024
$memlimit = 192 * 1024 * 1024
} elsif has_role('nm') {
$memlimit = 96 * 1024 * 1024
+ } elsif has_role('udd') {
+ $memlimit = 512 * 1024 * 1024
+ } elsif has_role('soo') {
+ $memlimit = 192 * 1024 * 1024
} else {
} else {
- $memlimit =
32
* 1024 * 1024
+ $memlimit =
64
* 1024 * 1024
}
apache2::config { 'resource-limits':
}
apache2::config { 'resource-limits':
@@
-89,7
+97,7
@@
class apache2 {
if $::lsbmajdistrelease > 7 {
file { '/etc/apache2/mods-available/mpm_worker.conf':
if $::lsbmajdistrelease > 7 {
file { '/etc/apache2/mods-available/mpm_worker.conf':
-
source => 'puppet:///modules/apache2/mpm_worker'
,
+
content => template('apache2/mpm_worker.erb')
,
}
}
}
}