From 48ef6de397609a830458ba27fa238a59be02fea7 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 26 Jun 2014 01:15:15 +0200 Subject: [PATCH] horizon: fix setenv vhost config to use setenvif Closes-bug #520 Signed-off-by: Emilien Macchi --- manifests/dashboard.pp | 6 +++--- spec/classes/cloud_dashboard_spec.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index b6b59741..78f01b61 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -102,13 +102,13 @@ class cloud::dashboard( # Apache2 specific configuration if $ssl_forward { - $set_env_real = ['SetEnvIf X-Forwarded-Proto https HTTPS=1'] + $setenvif = ['X-Forwarded-Proto https HTTPS=1'] } else { - $set_env_real = [] + $setenvif = [] } $vhost_extra_params = { 'add_listen' => true, - 'setenv' => $set_env_real + 'setenvif' => $setenvif } ensure_resource('class', 'apache', { default_vhost => false diff --git a/spec/classes/cloud_dashboard_spec.rb b/spec/classes/cloud_dashboard_spec.rb index 665c48e7..7804caa2 100644 --- a/spec/classes/cloud_dashboard_spec.rb +++ b/spec/classes/cloud_dashboard_spec.rb @@ -51,7 +51,7 @@ describe 'cloud::dashboard' do :neutron_options => { 'enable_lb' => true }, :vhost_extra_params => { '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)