Use new style loading for cldr extension

[chef.git] / cookbooks / osqa / recipes / default.rb

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 6ab25051b02026c42a00015adf01bcab01dfe69a..dec8fada01683ff8f63dfb6090f6466fae3fd773 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -30,7 +30,7 @@ python_directory = "/opt/osqa-python"
 
 python_virtualenv python_directory
 
-python_package "django" do
+python_package "Django" do
   python_virtualenv python_directory
   version "1.6.11"
 end
@@ -40,7 +40,7 @@ python_package "html5lib" do
   version "0.999"
 end
 
-python_package "markdown" do
+python_package "Markdown" do
   python_virtualenv python_directory
   version "2.4"
 end
@@ -50,19 +50,19 @@ python_package "python-memcached" do
   version "1.53"
 end
 
-python_package "python_openid" do
+python_package "python-openid" do
   python_virtualenv python_directory
   version "2.2.5"
 end
 
-python_package "MySQL_python" do
+python_package "MySQL-python" do
   python_virtualenv python_directory
   version "1.2.3"
 end
 
 python_package "psycopg2" do
   python_virtualenv python_directory
-  version "2.4.5"
+  version "2.7.6.1"
 end
 
 python_package "South" do
@@ -94,7 +94,7 @@ node[:osqa][:sites].each do |site|
   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