From 91d4cf6ea7db0baf670b9fb6d74796742dfa6a0a Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 28 Sep 2009 22:22:52 +0200 Subject: include shorewall rules if needed --- manifests/init.pp | 3 +++ manifests/ssl.pp | 13 ++++++++----- 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 + } } -- cgit v1.2.3