summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-06 07:27:48 +0000
committerGerrit Code Review <review@openstack.org>2015-10-06 07:27:48 +0000
commit2a142ac0272066ed7216372aaf744fe6d585e64f (patch)
tree54a2b3b4b45064516c73056255921e24e959d8d4
parentedb7660f9be488ca3b852b63882f3955d84269c6 (diff)
parentc39fde20ed5cb616654d90863165fe91b5d04845 (diff)
Merge "Allow specification of locations to not be proxied"
-rw-r--r--manifests/vhost/proxy.pp3
-rw-r--r--templates/vhost-proxy.conf.erb6
2 files changed, 8 insertions, 1 deletions
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index 72d091d..86d5622 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -26,7 +26,8 @@ define httpd::vhost::proxy (
26 $servername = undef, 26 $servername = undef,
27 $serveraliases = undef, 27 $serveraliases = undef,
28 $ssl = false, 28 $ssl = false,
29 $vhost_name = '*' 29 $vhost_name = '*',
30 $proxyexclusions = undef,
30 ) { 31 ) {
31 32
32 include ::httpd 33 include ::httpd
diff --git a/templates/vhost-proxy.conf.erb b/templates/vhost-proxy.conf.erb
index 05c6a8a..f275775 100644
--- a/templates/vhost-proxy.conf.erb
+++ b/templates/vhost-proxy.conf.erb
@@ -16,6 +16,12 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
16 Order deny,allow 16 Order deny,allow
17 Allow from all 17 Allow from all
18 </Proxy> 18 </Proxy>
19
20<% if @proxyexclusions.is_a? Array %>
21 <% @proxyexclusions.each do |name| %><%= " ProxyPass #{name} !\n" %><% end %>
22<% elsif @proxyexclusions != nil %>
23<%= " ProxyPass #{@proxyexclusions} !" %>
24<% end %>
19 ProxyPass / <%= @dest %>/ 25 ProxyPass / <%= @dest %>/
20 ProxyPassReverse / <%= @dest %>/ 26 ProxyPassReverse / <%= @dest %>/
21 ProxyPreserveHost On 27 ProxyPreserveHost On