use the more generall http term for rules for apache

diff --git a/manifests/rules/apache.pp b/manifests/rules/http.pp
similarity index 88%
rename from manifests/rules/apache.pp
rename to manifests/rules/http.pp
index ca3f7d12255c6e9a27acd9f8a5475c424e7a1bf7..e6a9bdef917ca34911252484330af5579f62e5d7 100644 (file)
--- 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 (file)
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
similarity index 87%
rename from manifests/rules/apache/ssl.pp
rename to manifests/rules/https.pp
index d27c980caee326522ed003e9864e8a7f128fb76c..cc49d100360d500942205d4e1e03eeee4766ea8c 100644 (file)
--- 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',