Merge "Grant access for vhosts on Apache >= 2.4"
This commit is contained in:
commit
d2bd645ab6
|
@ -13,12 +13,6 @@ httpd::vhost { 'localhost':
|
|||
# Enable a secondary port to test proxy and redirect modules
|
||||
$override = '
|
||||
Listen 8080
|
||||
<Directory "/html">
|
||||
Options All
|
||||
AllowOverride All
|
||||
Require all granted
|
||||
Allow from all
|
||||
</Directory>
|
||||
'
|
||||
file { "${::httpd::params::vdir}override.conf":
|
||||
content => $override,
|
||||
|
|
|
@ -18,6 +18,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
|
|||
Order allow,deny
|
||||
allow from all
|
||||
Satisfy any
|
||||
<IfVersion >= 2.4>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
</Directory>
|
||||
ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
|
||||
LogLevel warn
|
||||
|
|
|
@ -15,6 +15,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
|
|||
<Proxy *>
|
||||
Order deny,allow
|
||||
Allow from all
|
||||
<IfVersion >= 2.4>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
</Proxy>
|
||||
|
||||
<% if @proxyexclusions.is_a? Array %>
|
||||
|
|
Loading…
Reference in New Issue