add a 'ssl' parameter, so you do not need to include two classes to get ssl

support, you can simply just pass the 'ssl => true'.

this may also help the occasional warning:

warning: Scope(Class[Apache::Ssl]): Could not look up qualified variable
'apache::manage_shorewall'; class apache has not been evaluated at
/srv/leap/puppet/modules/apache/manifests/ssl.pp:10

1 files changed, 5 insertions, 1 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index 574c212..542e7aa 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,7 +17,8 @@ class apache(
   $cluster_node = '',
   $manage_shorewall = false,
   $manage_munin = false,
-  $no_default_site = false
+  $no_default_site = false,
+  $ssl = false
 ) {
   case $::operatingsystem {
     centos: { include apache::centos }
@@ -32,5 +33,8 @@ class apache(
   if $apache::manage_shorewall {
     include shorewall::rules::http
   }
+  if $ssl {
+    include apache::ssl
+  }
 }