Correct some python package names

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

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 5d5b4b1f2dee2521f15c7234db3867eeb7756930..f31aa11dd9496e7c2765425b858933959a233fad 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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -18,20 +18,56 @@
 #
 
 include_recipe "tools"
 #
 
 include_recipe "tools"

-include_recipe "apache::ssl"
+include_recipe "apache"

 include_recipe "memcached"
 include_recipe "memcached"

+include_recipe "python"

 
 

-package "python-django"
-package "python-html5lib"
-package "python-markdown"
-package "python-memcache"
-package "python-openid"
-package "python-mysqldb"
-package "python-psycopg2"
-package "python-setuptools"
-
-easy_install_package "South" do
-  package_name "south"
+package "python-dev"
+package "libmysqlclient-dev"
+package "libpq-dev"
+
+python_directory = "/opt/osqa-python"
+
+python_virtualenv python_directory
+
+python_package "Django" do
+  python_virtualenv python_directory
+  version "1.6.11"
+end
+
+python_package "html5lib" do
+  python_virtualenv python_directory
+  version "0.999"
+end
+
+python_package "Markdown" do
+  python_virtualenv python_directory
+  version "2.4"
+end
+
+python_package "python-memcached" do
+  python_virtualenv python_directory
+  version "1.53"
+end
+
+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"
+end
+
+python_package "South" do
+  python_virtualenv python_directory
+  version "0.7.6"

 end
 
 apache_module "rewrite"
 end
 
 apache_module "rewrite"


@@ -39,6 +75,7 @@ apache_module "wsgi"
 
 node[:osqa][:sites].each do |site|
   site_name = site[:name]
 
 node[:osqa][:sites].each do |site|
   site_name = site[:name]

+  site_aliases = site[:aliases] || []

   directory = site[:directory] || "/srv/#{site_name}"
   site_user = site[:user] || node[:osqa][:user]
   site_user = Etc.getpwuid(site_user).name if site_user.is_a?(Integer)
   directory = site[:directory] || "/srv/#{site_name}"
   site_user = site[:user] || node[:osqa][:user]
   site_user = Etc.getpwuid(site_user).name if site_user.is_a?(Integer)


@@ -50,14 +87,14 @@ node[:osqa][:sites].each do |site|
   backup_name = site[:backup]
 
   ssl_certificate site_name do
   backup_name = site[:backup]
 
   ssl_certificate site_name do

-    domains site_name
+    domains [site_name] + site_aliases

     notifies :reload, "service[apache2]"
   end
 
   apache_site site_name do
     template "apache.erb"
     directory directory
     notifies :reload, "service[apache2]"
   end
 
   apache_site site_name do
     template "apache.erb"
     directory directory

-    variables :user => site_user, :group => site_group
+    variables :user => site_user, :group => site_group, :aliases => site_aliases, :python_home => python_directory

   end
 
   directory directory do
   end
 
   directory directory do


@@ -77,7 +114,7 @@ node[:osqa][:sites].each do |site|
 
   git "#{directory}/osqa" do
     action :sync
 
   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
     revision "live"
     user site_user
     group site_group