projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3d844c
)
revert RLimitMem for merkel altogether
author
Stephen Gran
<steve@lobefin.net>
Wed, 18 Nov 2009 00:41:10 +0000
(
00:41
+0000)
committer
Stephen Gran
<steve@lobefin.net>
Wed, 18 Nov 2009 00:41:10 +0000
(
00:41
+0000)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/apache2/templates/ressource-limits.erb
patch
|
blob
|
history
diff --git
a/modules/apache2/templates/ressource-limits.erb
b/modules/apache2/templates/ressource-limits.erb
index
82e4277
..
8ddb673
100644
(file)
--- a/
modules/apache2/templates/ressource-limits.erb
+++ b/
modules/apache2/templates/ressource-limits.erb
@@
-6,9
+6,7
@@
RLimitCPU 180
<%=
case fqdn
- when "merkel.debian.org" then
- # search stuff
- "RLimitMEM "+(128 * 1024**2).to_s
+ when "merkel.debian.org" then "" # maybe unlimited will be better
when "cimarosa.debian.org" then
# buildd.debian.org
"RLimitMEM "+(96 * 1024**2).to_s