From: Tom Hughes <tom@compton.nu>
Date: Tue, 26 Aug 2014 16:29:36 +0000 (+0100)
Subject: Fix apache alias for OSQA uploads
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/864c167a2b1df8496642199e549bdb3001c43bff?ds=sidebyside

Fix apache alias for OSQA uploads
---

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 976c29e7f..9776791e9 100644
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -51,7 +51,7 @@ node[:osqa][:sites].each do |site|
 
   apache_site name do
     template "apache.erb"
-    directory "#{directory}/osqa"
+    directory directory
     variables :user => site_user, :group => site_group
   end
 
diff --git a/cookbooks/osqa/templates/default/apache.erb b/cookbooks/osqa/templates/default/apache.erb
index 71d339dfd..665cdd7ef 100644
--- a/cookbooks/osqa/templates/default/apache.erb
+++ b/cookbooks/osqa/templates/default/apache.erb
@@ -21,15 +21,19 @@ WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4
         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 %>
 </VirtualHost>
 
-<Directory <%= @directory %>>
+<Directory <%= @directory %>/osqa>
+	Require all granted
+</Directory>
+
+<Directory <%= @directory %>/upfiles>
 	Require all granted
 </Directory>