From aa9d9d8516981d08b0b6e230d290c22834dee8d0 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 18 Apr 2013 17:19:32 -0400
Subject: update apache module to take the 'ssl' parameter, and pass it to the
 class, this eliminates a potential variable lookup ordering problem (#2273)

---
 puppet/modules/apache                          | 2 +-
 puppet/modules/site_webapp/manifests/apache.pp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/puppet/modules/apache b/puppet/modules/apache
index 6844258b..688f0779 160000
--- a/puppet/modules/apache
+++ b/puppet/modules/apache
@@ -1 +1 @@
-Subproject commit 6844258b567b5065f5488a12f3f18208ff36ecb0
+Subproject commit 688f07793a72ba4453f6663b6d19fe6388ba382f
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
index 103e4f35..8b340160 100644
--- a/puppet/modules/site_webapp/manifests/apache.pp
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -12,8 +12,7 @@ class site_webapp::apache {
   $api_cert         = $x509['cert']
   $api_root         = $x509['ca_cert']
 
-  class { '::apache': no_default_site => true }
-  include apache::ssl
+  class { '::apache': no_default_site => true, ssl => true }
 
   apache::module {
     'alias':   ensure => present;
-- 
cgit v1.2.3