X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/24ff6e33b025aedeea2db4655bec734089731b8e..4e38812ed90eda5b66f0c42b006a1e923cbdd0db:/cookbooks/osqa/recipes/default.rb diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb index 6ab25051b..6e8d00d4a 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. @@ -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