aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-09-28 23:15:40 +0200
committerMicah Anderson <micah@riseup.net>2009-12-07 11:34:02 -0500
commitb28f0465ddf70fe5f35725a5b8ae3b38737eb5c5 (patch)
tree04b283157352d306e1a1650e5734ee16abda4e28
parenta7e3dafcca646236950920e9a8038e174e9c950a (diff)
downloadpuppet-shorewall-b28f0465ddf70fe5f35725a5b8ae3b38737eb5c5.tar.gz
puppet-shorewall-b28f0465ddf70fe5f35725a5b8ae3b38737eb5c5.tar.bz2
use the more generall http term for rules for apache
-rw-r--r--manifests/rules/http.pp (renamed from manifests/rules/apache.pp)2
-rw-r--r--manifests/rules/http/disable.pp5
-rw-r--r--manifests/rules/https.pp (renamed from manifests/rules/apache/ssl.pp)2
3 files changed, 7 insertions, 2 deletions
diff --git a/manifests/rules/apache.pp b/manifests/rules/http.pp
index ca3f7d1..e6a9bde 100644
--- a/manifests/rules/apache.pp
+++ b/manifests/rules/http.pp
@@ -1,4 +1,4 @@
-class shorewall::rules::apache {
+class shorewall::rules::http {
shorewall::rule { 'net-me-http-tcp':
source => 'net',
destination => '$FW',
diff --git a/manifests/rules/http/disable.pp b/manifests/rules/http/disable.pp
new file mode 100644
index 0000000..5b54740
--- /dev/null
+++ b/manifests/rules/http/disable.pp
@@ -0,0 +1,5 @@
+class shorewall::rules::http::disable inherits shorewall::http {
+ Shorewall::Rule['net-me-http-tcp']{
+ action => 'DROP',
+ }
+}
diff --git a/manifests/rules/apache/ssl.pp b/manifests/rules/https.pp
index d27c980..cc49d10 100644
--- a/manifests/rules/apache/ssl.pp
+++ b/manifests/rules/https.pp
@@ -1,4 +1,4 @@
-class shorewall::rules::apache::ssl {
+class shorewall::rules::https {
shorewall::rule { 'net-me-https-tcp':
source => 'net',
destination => '$FW',