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

support apache 2.4 access control syntax #32

Merged
merged 1 commit into from
Oct 6, 2014
Merged

support apache 2.4 access control syntax #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion templates/default/web_app.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@
LogLevel warn

<Proxy *>
<% if node['apache'] && node['apache']['version'] == '2.4' %>
Require all granted
<% else %>
Order Deny,Allow
Allow from all
<% end %>
</Proxy>
ProxyPass / http://localhost:<%= node['stash']['tomcat']['port'] %>/ connectiontimeout=5 timeout=300
ProxyPassReverse / http://localhost:<%= node['stash']['tomcat']['port'] %>/
Expand All @@ -43,8 +47,12 @@
LogLevel warn

<Proxy *>
<% if node['apache'] && node['apache']['version'] == '2.4' %>
Require all granted
<% else %>
Order Deny,Allow
Allow from all
<% end %>
</Proxy>
ProxyPass / http://localhost:<%= node['stash']['tomcat']['port'] %>/ connectiontimeout=5 timeout=300
ProxyPassReverse / http://localhost:<%= node['stash']['tomcat']['port'] %>/
Expand All @@ -55,4 +63,4 @@
<% unless node['stash']['apache2']['ssl']['chain_file'].empty? -%>
SSLCertificateChainFile <%= node['stash']['apache2']['ssl']['chain_file'] %>
<% end -%>
</VirtualHost>
</VirtualHost>