projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
class documentation
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
d8990b1
..
dec3162
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-22,7
+22,11
@@
class apache2 {
}
apache2::config { 'ressource-limits':
}
apache2::config { 'ressource-limits':
- content => template('apache2/ressource-limits.erb'),
+ ensure => absent,
+ }
+
+ apache2::config { 'resource-limits':
+ content => template('apache2/resource-limits.erb'),
}
apache2::config { 'security':
}
apache2::config { 'security':
@@
-68,7
+72,7
@@
class apache2 {
script => 'ps_',
}
script => 'ps_',
}
- if $::hostname in [
holter,
beach,buxtehude,picconi,pkgmirror-1and1] {
+ if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':
include apache2::dynamic
} else {
@ferm::rule { 'dsa-http':