From 43f08c2863723388792d4734b335465b4d645405 Mon Sep 17 00:00:00 2001 From: Andrew Goktepe Date: Mon, 7 Jul 2014 11:47:12 -0700 Subject: [PATCH] support apache 2.4 access control syntax --- templates/default/web_app.conf.erb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/default/web_app.conf.erb b/templates/default/web_app.conf.erb index 513643d..edae4b1 100644 --- a/templates/default/web_app.conf.erb +++ b/templates/default/web_app.conf.erb @@ -19,8 +19,12 @@ LogLevel warn + <% if node['apache'] && node['apache']['version'] == '2.4' %> + Require all granted + <% else %> Order Deny,Allow Allow from all + <% end %> ProxyPass / http://localhost:<%= node['stash']['tomcat']['port'] %>/ connectiontimeout=5 timeout=300 ProxyPassReverse / http://localhost:<%= node['stash']['tomcat']['port'] %>/ @@ -43,8 +47,12 @@ LogLevel warn + <% if node['apache'] && node['apache']['version'] == '2.4' %> + Require all granted + <% else %> Order Deny,Allow Allow from all + <% end %> ProxyPass / http://localhost:<%= node['stash']['tomcat']['port'] %>/ connectiontimeout=5 timeout=300 ProxyPassReverse / http://localhost:<%= node['stash']['tomcat']['port'] %>/ @@ -55,4 +63,4 @@ <% unless node['stash']['apache2']['ssl']['chain_file'].empty? -%> SSLCertificateChainFile <%= node['stash']['apache2']['ssl']['chain_file'] %> <% end -%> - \ No newline at end of file +