stackforge/puppet-openstack-cloud
Code Issues Proposed changes

horizon: fix setenv vhost config to use setenvif

Browse Source 
Closes-bug #520

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-06-26 01:15:15 +02:00
parent 3b90a496fb
commit 48ef6de397
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/dashboard.pp
View File

@ -102,13 +102,13 @@ class cloud::dashboard(
# Apache2 specific configuration # Apache2 specific configuration
if $ssl_forward { if $ssl_forward {
$set_env_real = ['SetEnvIf X-Forwarded-Proto https HTTPS=1'] $setenvif = ['X-Forwarded-Proto https HTTPS=1']
} else { } else {
$set_env_real = [] $setenvif = []
} }
$vhost_extra_params = { $vhost_extra_params = {
'add_listen' => true, 'add_listen' => true,
'setenv' => $set_env_real 'setenvif' => $setenvif
} }
ensure_resource('class', 'apache', { ensure_resource('class', 'apache', {
default_vhost => false default_vhost => false

2
spec/classes/cloud_dashboard_spec.rb
View File

@ -51,7 +51,7 @@ describe 'cloud::dashboard' do
:neutron_options => { 'enable_lb' => true }, :neutron_options => { 'enable_lb' => true },
:vhost_extra_params => { :vhost_extra_params => {
'add_listen' => true , 'add_listen' => true ,
'setenv' => ['SetEnvIf X-Forwarded-Proto https HTTPS=1'] 'setenvif' => ['X-Forwarded-Proto https HTTPS=1']
} }
) )
should contain_class('apache').with(:default_vhost => false) should contain_class('apache').with(:default_vhost => false)