From e433b14fa14837f9889e08cb662bf29498179237 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 5 Nov 2015 22:43:42 +0100 Subject: [bug] [jessie] Allow apache to access webapp dir - Resolves: #7580 --- puppet/modules/site_apache/templates/vhosts.d/api.conf.erb | 6 ++++++ puppet/modules/site_apache/templates/vhosts.d/common.conf.erb | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'puppet/modules/site_apache') diff --git a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb index 0396f54b..a54112f8 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb @@ -27,6 +27,12 @@ Listen 0.0.0.0:<%= api_port %> DocumentRoot /srv/leap/webapp/public + <% if Gem::Version.new(@apache_version) > Gem::Version.new('2.3') %> + + AllowOverride None + Require all granted + + <% end %> # Check for maintenance file and redirect all requests RewriteEngine On diff --git a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb index 21c3a211..cbb08c30 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb @@ -32,6 +32,12 @@ <% if (defined? @services) and (@services.include? 'webapp') -%> DocumentRoot /srv/leap/webapp/public + <% if Gem::Version.new(@apache_version) > Gem::Version.new('2.3') %> + + AllowOverride None + Require all granted + + <% end %> RewriteEngine On # Check for maintenance file and redirect all requests -- cgit v1.2.3