From eedc2abb6654753be77b4a35f40eb19804018806 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Wed, 29 Jul 2015 22:17:11 -0700 Subject: [PATCH] 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 --- manifests/vhost/proxy.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 ( $apache_name = $httpd::params::apache_name $ssl_path = $httpd::params::ssl_path - $srvname = $name + if $servername == '' { + $srvname = $name + } else { + $srvname = $servername + } if $ssl == true { include httpd::ssl