From 10ae336f12f56b08d9d1876f7d94057ac27816fc Mon Sep 17 00:00:00 2001 From: John Kristensen Date: Wed, 3 Aug 2016 14:29:53 +1000 Subject: [PATCH] Correct ProxyPassTarget default for ProxyPassReverseTarget (#154) According to the pillar.example file there is no site.ProxyPassTarget, so ProxyPassReverseTarget should default to proxyargs.ProxyPassTarget (ie. site.ProxyRoute.ProxyPassTarget) --- apache/vhosts/proxy.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache/vhosts/proxy.tmpl b/apache/vhosts/proxy.tmpl index d94f310..aa0cdaa 100644 --- a/apache/vhosts/proxy.tmpl +++ b/apache/vhosts/proxy.tmpl @@ -53,7 +53,7 @@ 'ProxyPassTarget': proxyargs.get('ProxyPassTarget', 'https://{0}'.format(sitename)), 'ProxyPassTargetOptions': proxyargs.get('ProxyPassTargetOptions', ''), 'ProxyPassReverseSource': proxyargs.get('ProxyPassReverseSource', '/'), - 'ProxyPassReverseTarget': proxyargs.get('ProxyPassReverseTarget', site.get('ProxyPassTarget', 'https://{0}'.format(sitename))), + 'ProxyPassReverseTarget': proxyargs.get('ProxyPassReverseTarget', proxyargs.get('ProxyPassTarget', 'https://{0}'.format(sitename))), } %} ######### {{proxy}} ######### ProxyPass {{ proxyvals.ProxyPassSource }} {{ proxyvals.ProxyPassTarget }} {{ proxyvals.ProxyPassTargetOptions }}