diff options
| author | varac <varacanero@zeromail.org> | 2015-12-16 00:07:56 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-12-16 00:07:56 +0100 |
| commit | 7c39fbed5a464a70079036586409b5c2d52d9a21 (patch) | |
| tree | 1c6a6bea36029ab7c79387a9d93cbf946ca75cbc /puppet/modules | |
| parent | 583ce5e8f3b548f17fb3f9a48156edeba381e260 (diff) | |
| parent | 26ece7a240fe842e5645a47bac86699c5d2bd34c (diff) | |
Merge branch '7681_apache_2_4_auth_error' into develop
Diffstat (limited to 'puppet/modules')
3 files changed, 14 insertions, 2 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 9efc6b41..d566437a 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb @@ -27,7 +27,7 @@ Listen 0.0.0.0:<%= @api_port %> </IfModule> DocumentRoot /srv/leap/webapp/public - <% if Gem::Version.new(@apache_version) > Gem::Version.new('2.3') %> + <% if scope.function_guess_apache_version([]) == '2.4' %> <Directory /srv/leap/webapp/public> AllowOverride None Require all granted 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 cbb08c30..b24d1353 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/common.conf.erb @@ -32,7 +32,7 @@ <% if (defined? @services) and (@services.include? 'webapp') -%> DocumentRoot /srv/leap/webapp/public - <% if Gem::Version.new(@apache_version) > Gem::Version.new('2.3') %> + <% if scope.function_guess_apache_version([]) == '2.4' %> <Directory /srv/leap/webapp/public> AllowOverride None Require all granted diff --git a/puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb index 2c8d5eb5..653664ec 100644 --- a/puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb +++ b/puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb @@ -8,6 +8,12 @@ <% if (defined? @services) and (@services.include? 'webapp') -%> DocumentRoot /srv/leap/webapp/public + <% if scope.function_guess_apache_version([]) == '2.4' %> + <Directory /srv/leap/webapp/public> + AllowOverride None + Require all granted + </Directory> + <% end %> RewriteEngine On # Check for maintenance file and redirect all requests @@ -33,6 +39,12 @@ <% if (defined? @services) and (@services.include? 'static') -%> DocumentRoot "/srv/static/root/public" + <% if scope.function_guess_apache_version([]) == '2.4' %> + <Directory /srv/static/root/public> + AllowOverride None + Require all granted + </Directory> + <% end %> AccessFileName .htaccess Alias /provider.json /srv/leap/provider.json |