Fix apache alias for OSQA uploads

[chef.git] / cookbooks / osqa / templates / default / apache.erb

diff --git a/cookbooks/osqa/templates/default/apache.erb b/cookbooks/osqa/templates/default/apache.erb
index ad98501626d0fa0654df814ed5af0d59f65b88f8..665cdd7ef167e4af66b2e537b3238dabab805c3f 100644 (file)
--- a/cookbooks/osqa/templates/default/apache.erb
+++ b/cookbooks/osqa/templates/default/apache.erb
@@ -16,16 +16,24 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
         ServerName <%= @name %>
         ServerAdmin webmaster@openstreetmap.org
 
+        SSLEngine on
+
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
-        DocumentRoot <%= @directory %>
-        Alias /m/ <%= @directory %>/forum/skins/
-        Alias /upfiles/ <%= @directory %>/forum/upfiles/
+        DocumentRoot <%= @directory %>/osqa
+        Alias /m/ <%= @directory %>/osqa/forum/skins/
+        Alias /upfiles/ <%= @directory %>/upfiles/
         Alias /admin_media/ /usr/share/pyshared/django/contrib/admin/media/
-        WSGIScriptAlias / <%= @directory %>/osqa.wsgi
+        WSGIScriptAlias / <%= @directory %>/osqa/osqa.wsgi
 
         WSGIProcessGroup <%= @name %>
-
-        SSLEngine on
 </VirtualHost>
+
+<Directory <%= @directory %>/osqa>
+       Require all granted
+</Directory>
+
+<Directory <%= @directory %>/upfiles>
+       Require all granted
+</Directory>