opendev
/
puppet-askbot
Code Issues Proposed changes

Move to apache 2.4 access always 

Because this only matches trusty, it installs the old access list on
xenial and beyond.  Just use the 2.4 format.

Change-Id: I62a54e1c886efea9f1377967e8e4716068c53b4a
This commit is contained in:
Ian Wienand 2019-05-16 15:08:35 +10:00
parent 14b0bb1606
commit b7ec30a9de
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 # Managed by Puppet
# ************************************ # ************************************
<% trusty_compatible = @lsbdistcodename == 'trusty' %>
WSGIRestrictStdout On WSGIRestrictStdout On
WSGIRestrictSignal Off WSGIRestrictSignal Off
@ -31,17 +29,13 @@ NameVirtualHost <%= @vhost_name %>:443
# media files # media files
Alias /m/ <%= @docroot %>/static/ Alias /m/ <%= @docroot %>/static/
<Directory <%= @docroot %>/static/> <Directory <%= @docroot %>/static/>
Order deny,allow Require all granted
Allow from all
<%if trusty_compatible %>Require all granted<%end%>
</Directory> </Directory>
# uploaded files # uploaded files
Alias /upfiles/ <%= @docroot %>/upfiles/ Alias /upfiles/ <%= @docroot %>/upfiles/
<Directory <%= @docroot %>/upfiles/> <Directory <%= @docroot %>/upfiles/>
Order deny,allow Require all granted
Allow from all
<%if trusty_compatible %>Require all granted<%end%>
</Directory> </Directory>
# wsgi daemon # wsgi daemon
@ -51,9 +45,7 @@ NameVirtualHost <%= @vhost_name %>:443
<Location /> <Location />
WSGIProcessGroup askbot WSGIProcessGroup askbot
Order deny,allow Require all granted
Allow from all
<%if trusty_compatible %>Require all granted<%end%>
</Location> </Location>
ErrorLog /var/log/apache2/<%= @name %>_error.log ErrorLog /var/log/apache2/<%= @name %>_error.log