opendev
/
puppet-askbot
Code Issues Proposed changes

Merge "Move to apache 2.4 access always"

This commit is contained in:
Zuul 2019-05-20 00:15:15 +00:00 committed by Gerrit Code Review
parent 1278d4d71e b7ec30a9de
commit 57438900ad
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/askbot.vhost.erb
View File

@ -3,8 +3,6 @@
# Managed by Puppet
# ************************************
<% trusty_compatible = @lsbdistcodename == 'trusty' %>
WSGIRestrictStdout On
WSGIRestrictSignal Off
@ -31,17 +29,13 @@ NameVirtualHost <%= @vhost_name %>:443
# media files
Alias /m/ <%= @docroot %>/static/
<Directory <%= @docroot %>/static/>
Order deny,allow
Allow from all
<%if trusty_compatible %>Require all granted<%end%>
Require all granted
</Directory>
# uploaded files
Alias /upfiles/ <%= @docroot %>/upfiles/
<Directory <%= @docroot %>/upfiles/>
Order deny,allow
Allow from all
<%if trusty_compatible %>Require all granted<%end%>
Require all granted
</Directory>
# wsgi daemon
@ -51,9 +45,7 @@ NameVirtualHost <%= @vhost_name %>:443
<Location />
WSGIProcessGroup askbot
Order deny,allow
Allow from all
<%if trusty_compatible %>Require all granted<%end%>
Require all granted
</Location>
ErrorLog /var/log/apache2/<%= @name %>_error.log