X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/24ff6e33b025aedeea2db4655bec734089731b8e..dd7f629ab3f1404a2a3ea5a9c4e28c416ecb6e3b:/cookbooks/osqa/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 6ab25051b..3a229531f 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"
@@ -28,19 +29,16 @@ package "libpq-dev"
 
 python_directory = "/opt/osqa-python"
 
-python_virtualenv python_directory
-
-python_package "django" do
-  python_virtualenv python_directory
-  version "1.6.11"
+python_virtualenv python_directory do
+  interpreter "/usr/bin/python2"
 end
 
-python_package "html5lib" do
+python_package "Django" do
   python_virtualenv python_directory
-  version "0.999"
+  version "1.6.11"
 end
 
-python_package "markdown" do
+python_package "Markdown" do
   python_virtualenv python_directory
   version "2.4"
 end
@@ -50,19 +48,14 @@ 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_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
@@ -70,6 +63,11 @@ python_package "South" do
   version "0.7.6"
 end
 
+python_package "html5lib" do
+  python_virtualenv python_directory
+  version "0.999"
+end
+
 apache_module "rewrite"
 apache_module "wsgi"
 
@@ -94,13 +92,13 @@ 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
     owner site_user
     group site_group
-    mode 0o755
+    mode "755"
   end
 
   execute "osqa-migrate" do
@@ -116,6 +114,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]"
@@ -124,14 +123,14 @@ node[:osqa][:sites].each do |site|
   directory "#{directory}/upfiles" do
     user site_user
     group site_group
-    mode 0o755
+    mode "755"
   end
 
   template "#{directory}/osqa/osqa.wsgi" do
     source "osqa.wsgi.erb"
     owner site_user
     group site_group
-    mode 0o644
+    mode "644"
     variables :directory => directory
     notifies :reload, "service[apache2]"
   end
@@ -153,7 +152,7 @@ node[:osqa][:sites].each do |site|
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group
-    mode 0o644
+    mode "644"
     content settings
     notifies :reload, "service[apache2]"
   end
@@ -162,7 +161,7 @@ node[:osqa][:sites].each do |site|
     source "backup.cron.erb"
     owner "root"
     group "root"
-    mode 0o755
+    mode "755"
     variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name
   end
 end