diff --git a/templates/askbot.vhost.erb b/templates/askbot.vhost.erb index f0fa4e5..1ab7bf4 100644 --- a/templates/askbot.vhost.erb +++ b/templates/askbot.vhost.erb @@ -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/ /static/> - Order deny,allow - Allow from all - <%if trusty_compatible %>Require all granted<%end%> + Require all granted # uploaded files Alias /upfiles/ <%= @docroot %>/upfiles/ /upfiles/> - Order deny,allow - Allow from all - <%if trusty_compatible %>Require all granted<%end%> + Require all granted # wsgi daemon @@ -51,9 +45,7 @@ NameVirtualHost <%= @vhost_name %>:443 WSGIProcessGroup askbot - Order deny,allow - Allow from all - <%if trusty_compatible %>Require all granted<%end%> + Require all granted ErrorLog /var/log/apache2/<%= @name %>_error.log