X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2a01efac2b431b988acbc7a45aa88f0f9223181d..5844c5bc2edf22e4d6a4316f887adf758584a008:/cookbooks/osqa/recipes/default.rb

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index ab9341815..72534683e 100644
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: osqa
+# Cookbook:: osqa
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,10 +17,11 @@
 # limitations under the License.
 #
 
-include_recipe "tools"
+include_recipe "accounts"
 include_recipe "apache"
 include_recipe "memcached"
 include_recipe "python"
+include_recipe "tools"
 
 package "python-dev"
 package "libmysqlclient-dev"
@@ -30,7 +31,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 +41,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 +51,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
@@ -116,6 +117,7 @@ node[:osqa][:sites].each do |site|
     action :sync
     repository "https://git.openstreetmap.org/public/osqa.git"
     revision "live"
+    depth 1
     user site_user
     group site_group
     notifies :run, "execute[osqa-migrate]"