Use virtualenv for OSQA

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 6ab25051b02026c42a00015adf01bcab01dfe69a..ab93418150fe7a2ea407d85a84403202446bfd6f 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -94,7 +94,7 @@ node[:osqa][:sites].each do |site|
   apache_site site_name do
     template "apache.erb"
     directory directory
   apache_site site_name do
     template "apache.erb"
     directory directory

-    variables :user => site_user, :group => site_group, :aliases => site_aliases
+    variables :user => site_user, :group => site_group, :aliases => site_aliases, :python_home => python_directory

   end
 
   directory directory do
   end
 
   directory directory do

diff --git a/cookbooks/osqa/templates/default/apache.erb b/cookbooks/osqa/templates/default/apache.erb
index 9755474719926076717a889d93b365d3ba733f5d..2d6e77139c442be71132eda375fc8be704c284f3 100644 (file)
--- a/cookbooks/osqa/templates/default/apache.erb
+++ b/cookbooks/osqa/templates/default/apache.erb
@@ -1,6 +1,6 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

-WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4 threads=4
+WSGIDaemonProcess <%= @name %> user=<%= @user %> group=<%= @group %> processes=4 threads=4 python-home=<%= @python_home %>

 
 <VirtualHost *:80>
   ServerName <%= @name %>
 
 <VirtualHost *:80>
   ServerName <%= @name %>