summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-12-04 22:35:30 -0500
committerMicah Anderson <micah@riseup.net>2012-12-04 22:35:30 -0500
commit8d50b9ded53420fc4824b77933ce9357b11a5a45 (patch)
tree13eb0123c6b95cf6f7d5109bba485618b027be84
parent138dcd8cea024d79923e9ae89df975396ed6cac7 (diff)
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
-rw-r--r--puppet/modules/site_couchdb/manifests/apache_ssl_proxy.pp3
1 files changed, 2 insertions, 1 deletions
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;
}