projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'ganneff/master'
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
manifests
/
init.pp
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
b61b89a
..
62866e6
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-138,14
+138,7
@@
class apache2 {
}
case $hostname {
}
case $hostname {
- sibelius,stabile: {
- @ferm::rule { "dsa-http":
- prio => "23",
- description => "Allow web access",
- rule => "&SERVICE(tcp, (http https))"
- }
- }
- default: {
+ busoni,duarte,holter,lindberg,master,merkel,powell,rore: {
@ferm::rule { "dsa-http-limit":
prio => "20",
description => "limit HTTP DOS",
@ferm::rule { "dsa-http-limit":
prio => "20",
description => "limit HTTP DOS",
@@
-212,6
+205,13
@@
class apache2 {
rule => "proto tcp dport (http https) jump http;"
}
}
rule => "proto tcp dport (http https) jump http;"
}
}
+ default: {
+ @ferm::rule { "dsa-http":
+ prio => "23",
+ description => "Allow web access",
+ rule => "&SERVICE(tcp, (http https))"
+ }
+ }
}
@ferm::rule { "dsa-http-v6":
domain => "(ip6)",
}
@ferm::rule { "dsa-http-v6":
domain => "(ip6)",