Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Commit 43f08c2

Browse files
committed
support apache 2.4 access control syntax
1 parent a43e531 commit 43f08c2

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

templates/default/web_app.conf.erb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@
1919
LogLevel warn
2020

2121
<Proxy *>
22+
<% if node['apache'] && node['apache']['version'] == '2.4' %>
23+
Require all granted
24+
<% else %>
2225
Order Deny,Allow
2326
Allow from all
27+
<% end %>
2428
</Proxy>
2529
ProxyPass / http://localhost:<%= node['stash']['tomcat']['port'] %>/ connectiontimeout=5 timeout=300
2630
ProxyPassReverse / http://localhost:<%= node['stash']['tomcat']['port'] %>/
@@ -43,8 +47,12 @@
4347
LogLevel warn
4448

4549
<Proxy *>
50+
<% if node['apache'] && node['apache']['version'] == '2.4' %>
51+
Require all granted
52+
<% else %>
4653
Order Deny,Allow
4754
Allow from all
55+
<% end %>
4856
</Proxy>
4957
ProxyPass / http://localhost:<%= node['stash']['tomcat']['port'] %>/ connectiontimeout=5 timeout=300
5058
ProxyPassReverse / http://localhost:<%= node['stash']['tomcat']['port'] %>/
@@ -55,4 +63,4 @@
5563
<% unless node['stash']['apache2']['ssl']['chain_file'].empty? -%>
5664
SSLCertificateChainFile <%= node['stash']['apache2']['ssl']['chain_file'] %>
5765
<% end -%>
58-
</VirtualHost>
66+
</VirtualHost>

0 commit comments

Comments
 (0)