From b1640f4f3db55a7a46a024073eb00c49d400e0ba Mon Sep 17 00:00:00 2001
From: Martin Jackson <martin@uncommonsense-uk.com>
Date: Mon, 23 May 2016 18:32:12 +0100
Subject: [PATCH] [#141] Support additional options for Proxypass (#142)

* Add support for proxy pass target options

* Add example usage
---
 apache/vhosts/proxy.tmpl | 3 ++-
 pillar.example           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apache/vhosts/proxy.tmpl b/apache/vhosts/proxy.tmpl
index 36b1887..5c6115c 100644
--- a/apache/vhosts/proxy.tmpl
+++ b/apache/vhosts/proxy.tmpl
@@ -50,11 +50,12 @@
     {% set proxyvals = {
         'ProxyPassSource': proxyargs.get('ProxyPassSource', '/'),
         '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))),
     } %}
     ######### {{proxy}} #########
-    ProxyPass               {{ proxyvals.ProxyPassSource }} {{ proxyvals.ProxyPassTarget }}
+    ProxyPass               {{ proxyvals.ProxyPassSource }} {{ proxyvals.ProxyPassTarget }} {{ proxyvals.ProxyPassTargetOptions }}
     ProxyPassReverse        {{ proxyvals.ProxyPassReverseSource }} {{ proxyvals.ProxyPassReverseTarget }}
     {% endfor %}
     {% if site.get('Formula_Append') %}
diff --git a/pillar.example b/pillar.example
index 5b8cad7..9ad1070 100644
--- a/pillar.example
+++ b/pillar.example
@@ -90,6 +90,7 @@ apache:
       #   my sample route:
       #      ProxyPassSource: '/'
       #      ProxyPassTarget: 'http://www.example.net'
+      #      ProxyPassTargetOptions: 'connectiontimeout=5 timeout=30'
       #      ProxyPassReverseSource: '/'
       #      ProxyPassReverseTarget: 'http://www.example.net'