# 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,
#
include_recipe "tools"
-include_recipe "apache::ssl"
+include_recipe "apache"
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"
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)
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
- 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
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