summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Stanley <fungi@yuggoth.org>2018-02-22 16:28:32 +0000
committerJeremy Stanley <fungi@yuggoth.org>2018-02-22 16:28:32 +0000
commiteec99fedb987fde337293828856494ef834cf4cc (patch)
treeb6c5bfaf2909d35f63bfd31630e3dd0fb194e087
parentefd4267ef4f80e4f37503ee84ae78bb39d6e3483 (diff)
Allow access to docroot for proxy exclusionsHEADmaster
In a httpd::vhost::proxy resource, if proxy exclusions and a docroot are specified, we should allow clients to access contents of the docroot. Change-Id: If30b192b8f2c16375aa534131217a5aa2a9ff47d
Notes
Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Code-Review+1: Mohammed Naser <mnaser@vexxhost.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 22 Feb 2018 18:25:01 +0000 Reviewed-on: https://review.openstack.org/547062 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--templates/vhost-proxy.conf.erb7
1 files changed, 7 insertions, 0 deletions
diff --git a/templates/vhost-proxy.conf.erb b/templates/vhost-proxy.conf.erb
index 5e5818c..24d0a73 100644
--- a/templates/vhost-proxy.conf.erb
+++ b/templates/vhost-proxy.conf.erb
@@ -33,6 +33,13 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
33 33
34<% if @proxyexclusions != nil and @docroot != nil %> 34<% if @proxyexclusions != nil and @docroot != nil %>
35 DocumentRoot <%= @docroot %> 35 DocumentRoot <%= @docroot %>
36 <Directory <%= @docroot %>>
37 Order deny,allow
38 Allow from all
39 <IfVersion >= 2.4>
40 Require all granted
41 </IfVersion>
42 </Directory>
36<% end %> 43<% end %>
37 ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log 44 ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
38 LogLevel warn 45 LogLevel warn