summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2015-07-29 22:17:11 -0700
committerColleen Murphy <colleen@gazlene.net>2015-07-29 23:18:17 -0700
commiteedc2abb6654753be77b4a35f40eb19804018806 (patch)
tree79241fc3be5cde99d9076daa9448cce21077aba9
parentbb5bdb2a56ad3d0df4def9657dd6b834f463c131 (diff)
Fix $httpd::vhost::proxy::servername parameter
The $httpd::vhost::proxy::servername parameter was not being used, and the local variable $srvname was defaulting to the name of the defined type. This patch copies the logic from httpd::vhost to conditionally set $srvname to the $servername parameter if it is set, and default to the old behavior if not. Change-Id: I4936be856db1a1af279b7c3824606e2c0375e9a6
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Code-Review+2: yolanda.robla <info@ysoft.biz> Code-Review+1: Clint Adams <clint@gcfm.net> Submitted-by: Jenkins Submitted-at: Sun, 09 Aug 2015 03:00:03 +0000 Reviewed-on: https://review.openstack.org/207310 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--manifests/vhost/proxy.pp6
1 files changed, 5 insertions, 1 deletions
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index ea3720c..9e44da7 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -33,7 +33,11 @@ define httpd::vhost::proxy (
33 33
34 $apache_name = $httpd::params::apache_name 34 $apache_name = $httpd::params::apache_name
35 $ssl_path = $httpd::params::ssl_path 35 $ssl_path = $httpd::params::ssl_path
36 $srvname = $name 36 if $servername == '' {
37 $srvname = $name
38 } else {
39 $srvname = $servername
40 }
37 41
38 if $ssl == true { 42 if $ssl == true {
39 include httpd::ssl 43 include httpd::ssl