projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Link https://dev.gnupg.org/T4603 with workaround
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
d200391
..
b508416
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-54,6
+54,12
@@
class apache2 {
} else {
$memlimit = 192 * 1024 * 1024
}
} else {
$memlimit = 192 * 1024 * 1024
}
+ # debbugs cgis like to fork and don't deal well with EAGAIN
+ if has_role('bugs_base') {
+ $proclimit = 450
+ } else {
+ $proclimit = 256
+ }
apache2::config { 'resource-limits':
content => template('apache2/resource-limits.erb'),
apache2::config { 'resource-limits':
content => template('apache2/resource-limits.erb'),
@@
-87,10
+93,6
@@
class apache2 {
content => template('apache2/puppet-config.erb'),
}
content => template('apache2/puppet-config.erb'),
}
- apache2::config { 'pratchett':
- ensure => 'absent',
- }
-
apache2::config { 'headers':
source => 'puppet:///modules/apache2/headers',
}
apache2::config { 'headers':
source => 'puppet:///modules/apache2/headers',
}
@@
-111,10
+113,6
@@
class apache2 {
content => template('apache2/mpm_worker.erb'),
}
content => template('apache2/mpm_worker.erb'),
}
- file { '/etc/apache2/sites-available/common-ssl.inc':
- ensure => absent,
- }
-
file { '/etc/logrotate.d/apache2':
source => 'puppet:///modules/apache2/apache2.logrotate',
}
file { '/etc/logrotate.d/apache2':
source => 'puppet:///modules/apache2/apache2.logrotate',
}