summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-18 17:19:32 -0400
committerMicah Anderson <micah@riseup.net>2013-04-18 17:19:32 -0400
commitaa9d9d8516981d08b0b6e230d290c22834dee8d0 (patch)
tree8ec90f1b7f3da066b0341ecf5279f1451286e4f9 /puppet/modules
parent8485b9340b96c16f47d6de145ceca0d7838d2fdd (diff)
update apache module to take the 'ssl' parameter, and pass it to the class, this
eliminates a potential variable lookup ordering problem (#2273)
Diffstat (limited to 'puppet/modules')
m---------puppet/modules/apache0
-rw-r--r--puppet/modules/site_webapp/manifests/apache.pp3
2 files changed, 1 insertions, 2 deletions
diff --git a/puppet/modules/apache b/puppet/modules/apache
-Subproject 6844258b567b5065f5488a12f3f18208ff36ecb
+Subproject 688f07793a72ba4453f6663b6d19fe6388ba382
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;