mail: fix typo on community.openstreetmap.org domain

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

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index b7a6a8e6faa0b793b011f6c8e4afdf88521eeb22..3a229531f3d1408d79eca5fb295854a31b459ed4 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,


@@ -17,21 +17,55 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "tools"
+include_recipe "accounts"

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

+include_recipe "python"
+include_recipe "tools"
+
+package "python-dev"
+package "libmysqlclient-dev"
+package "libpq-dev"
+
+python_directory = "/opt/osqa-python"
+
+python_virtualenv python_directory do
+  interpreter "/usr/bin/python2"
+end
+
+python_package "Django" do
+  python_virtualenv python_directory
+  version "1.6.11"
+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 "psycopg2" do
+  python_virtualenv python_directory
+  version "2.7.6.1"
+end
+
+python_package "South" do
+  python_virtualenv python_directory
+  version "0.7.6"
+end

 
 

-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"
+python_package "html5lib" do
+  python_virtualenv python_directory
+  version "0.999"

 end
 
 apache_module "rewrite"
 end
 
 apache_module "rewrite"


@@ -39,6 +73,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,20 +85,20 @@ 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
     owner site_user
     group site_group
   end
 
   directory directory do
     owner site_user
     group site_group

-    mode 0o755
+    mode "755"

   end
 
   execute "osqa-migrate" do
   end
 
   execute "osqa-migrate" do


@@ -77,8 +112,9 @@ 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"
     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]"


@@ -87,14 +123,14 @@ node[:osqa][:sites].each do |site|
   directory "#{directory}/upfiles" do
     user site_user
     group site_group
   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
   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
     variables :directory => directory
     notifies :reload, "service[apache2]"
   end


@@ -116,7 +152,7 @@ node[:osqa][:sites].each do |site|
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group

-    mode 0o644
+    mode "644"

     content settings
     notifies :reload, "service[apache2]"
   end
     content settings
     notifies :reload, "service[apache2]"
   end


@@ -125,7 +161,7 @@ node[:osqa][:sites].each do |site|
     source "backup.cron.erb"
     owner "root"
     group "root"
     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
     variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name
   end
 end