Merge "Allow specification of locations to not be proxied"

manifests/vhost/proxy.pp

@@ -26,7 +26,8 @@ define httpd::vhost::proxy (
     $servername    = undef,
     $serveraliases = undef,
     $ssl           = false,
-    $vhost_name    = '*'
+    $vhost_name    = '*',
+    $proxyexclusions = undef,
   ) {
 
   include ::httpd

templates/vhost-proxy.conf.erb

@@ -16,6 +16,12 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
      Order deny,allow
      Allow from all
    </Proxy>
+
+<% if @proxyexclusions.is_a? Array %>
+        <% @proxyexclusions.each do |name| %><%= "    ProxyPass #{name} !\n" %><% end %>
+<% elsif @proxyexclusions != nil %>
+<%= "    ProxyPass #{@proxyexclusions} !" %>
+<% end %>
    ProxyPass        / <%= @dest %>/
    ProxyPassReverse / <%= @dest %>/
    ProxyPreserveHost On