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 dec8fada01683ff8f63dfb6090f6466fae3fd773..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"


@@ -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]"