summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-09-28 22:22:52 +0200
committermh <mh@immerda.ch>2009-09-28 22:22:52 +0200
commit91d4cf6ea7db0baf670b9fb6d74796742dfa6a0a (patch)
tree9b72d6f546d3fa59ef7542877ba0f7aad3216ed5 /manifests
parentc1482c600b33f8e01118e1b097fb9b4c36884e21 (diff)
include shorewall rules if needed
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp3
-rw-r--r--manifests/ssl.pp13
2 files changed, 11 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 74587db..c6b24a8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,5 +30,8 @@ class apache {
if $use_munin {
include apache::status
}
+ if $use_shorewall {
+ include shorewall::rules::http
+ }
}
diff --git a/manifests/ssl.pp b/manifests/ssl.pp
index a22920f..b85ee8e 100644
--- a/manifests/ssl.pp
+++ b/manifests/ssl.pp
@@ -1,9 +1,12 @@
# manifests/ssl.pp
class apache::ssl inherits apache {
- case $operatingsystem {
- centos: { include apache::ssl::centos }
- openbsd: { include apache::ssl::openbsd }
- defaults: { include apache::ssl::base }
- }
+ case $operatingsystem {
+ centos: { include apache::ssl::centos }
+ openbsd: { include apache::ssl::openbsd }
+ defaults: { include apache::ssl::base }
+ }
+ if $use_shorewall {
+ include shorewall::rules::http
+ }
}