Imagery: set GDAL_CACHEMAX environment variable

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

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index b7a6a8e6faa0b793b011f6c8e4afdf88521eeb22..a886fe6f48be46736eff216152c9cf771f9cc546 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -20,6 +20,7 @@
 include_recipe "tools"
 include_recipe "apache"
 include_recipe "memcached"
+include_recipe "python"
 
 package "python-django"
 package "python-html5lib"
@@ -30,9 +31,7 @@ package "python-mysqldb"
 package "python-psycopg2"
 package "python-setuptools"
 
-easy_install_package "South" do
-  package_name "south"
-end
+python_package "South"
 
 apache_module "rewrite"
 apache_module "wsgi"
@@ -77,7 +76,7 @@ node[:osqa][:sites].each do |site|
 
   git "#{directory}/osqa" do
     action :sync
-    repository "git://git.openstreetmap.org/osqa.git"
+    repository "https://git.openstreetmap.org/public/osqa.git"
     revision "live"
     user site_user
     group site_group