Update rubocop configuration for COP renames

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

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 6ab25051b02026c42a00015adf01bcab01dfe69a..72534683e669240507c5f58ac15849e2f4f8cd23 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: osqa
+# Cookbook:: osqa

 # Recipe:: default
 #
 # 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.
 #
 # 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.
 #
 
 # limitations under the License.
 #
 

-include_recipe "tools"
+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "memcached"
 include_recipe "python"
 include_recipe "apache"
 include_recipe "memcached"
 include_recipe "python"

+include_recipe "tools"

 
 package "python-dev"
 package "libmysqlclient-dev"
 
 package "python-dev"
 package "libmysqlclient-dev"


@@ -30,7 +31,7 @@ python_directory = "/opt/osqa-python"
 
 python_virtualenv python_directory
 
 
 python_virtualenv python_directory
 

-python_package "django" do
+python_package "Django" do

   python_virtualenv python_directory
   version "1.6.11"
 end
   python_virtualenv python_directory
   version "1.6.11"
 end


@@ -40,7 +41,7 @@ python_package "html5lib" do
   version "0.999"
 end
 
   version "0.999"
 end
 

-python_package "markdown" do
+python_package "Markdown" do

   python_virtualenv python_directory
   version "2.4"
 end
   python_virtualenv python_directory
   version "2.4"
 end


@@ -50,19 +51,19 @@ python_package "python-memcached" do
   version "1.53"
 end
 
   version "1.53"
 end
 

-python_package "python_openid" do
+python_package "python-openid" do

   python_virtualenv python_directory
   version "2.2.5"
 end
 
   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
   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
 end
 
 python_package "South" do


@@ -94,7 +95,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


@@ -116,6 +117,7 @@ node[:osqa][:sites].each do |site|
     action :sync
     repository "https://git.openstreetmap.org/public/osqa.git"
     revision "live"
     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]"
     user site_user
     group site_group
     notifies :run, "execute[osqa-migrate]"