projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prefix lindsay volumes with OLD-
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
9cd01c4
..
64bf7ff
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-63,14
+63,6
@@
class apache2(
ensure => absent,
}
ensure => absent,
}
- if has_role('udd') {
- $memlimit = 512 * 1024 * 1024
- } elsif has_role('popcon') {
- $memlimit = 512 * 1024 * 1024
- } else {
- $memlimit = $rlimitmem
- }
-
apache2::config { 'resource-limits':
content => template('apache2/resource-limits.erb'),
}
apache2::config { 'resource-limits':
content => template('apache2/resource-limits.erb'),
}
@@
-155,7
+147,7
@@
class apache2(
if $rate_limit {
include apache2::dynamic
} else {
if $rate_limit {
include apache2::dynamic
} else {
- ferm::rule { 'dsa-http':
+ ferm::rule { 'dsa-http
-allow
':
description => 'http subchain, allow everything',
prio => '90',
chain => 'http',
description => 'http subchain, allow everything',
prio => '90',
chain => 'http',