diff options
| author | varac <varacanero@zeromail.org> | 2015-11-05 22:43:42 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-11-17 19:51:11 +0100 |
| commit | e433b14fa14837f9889e08cb662bf29498179237 (patch) | |
| tree | 20010d752fd1554710d62aa4c895abe0fe4f390e /puppet/modules | |
| parent | dfe3a3415bffa554e47243322bba3e27ee45795d (diff) | |
[bug] [jessie] Allow apache to access webapp dir
- Resolves: #7580
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/api.conf.erb | 6 | ||||
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/common.conf.erb | 6 |
2 files changed, 12 insertions, 0 deletions
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 %> </IfModule> DocumentRoot /srv/leap/webapp/public + <% if Gem::Version.new(@apache_version) > Gem::Version.new('2.3') %> + <Directory /srv/leap/webapp/public> + AllowOverride None + Require all granted + </Directory> + <% 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') %> + <Directory /srv/leap/webapp/public> + AllowOverride None + Require all granted + </Directory> + <% end %> RewriteEngine On # Check for maintenance file and redirect all requests |