From 8d50b9ded53420fc4824b77933ce9357b11a5a45 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 4 Dec 2012 22:35:30 -0500
Subject: Stop the [warn] NameVirtualHost *:443 has no VirtualHosts errors

When we include apache::ssl it ships the ssl.conf file which sets up the
NameVirtualHost *:443, so we just do what that class does

fixes: https://leap.se/code/issues/944
---
 puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'puppet')

diff --git a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
index 92170780..21db3f56 100644
--- a/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
+++ b/puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp
@@ -1,9 +1,10 @@
 define site_couchdb::apache_ssl_proxy ($key, $cert) {
 
   $apache_no_default_site = true
-  include apache::ssl
+  include apache
   apache::module {
     'rewrite':      ensure => present;
+    'ssl':          ensure => present;
     'proxy':        ensure => present;
     'proxy_http':   ensure => present;
   }
-- 
cgit v1.2.3