X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/069e33163e0b09a7d647a98c2fde284a16a43b99..45c0862be818c87ac9825ed36a7a2e9d3a1aab7c:/cookbooks/osqa/recipes/default.rb diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb index db96e2e79..4cbd677a6 100644 --- a/cookbooks/osqa/recipes/default.rb +++ b/cookbooks/osqa/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: osqa +# Cookbook:: osqa # 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 # -# 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, @@ -17,48 +17,100 @@ # limitations under the License. # -include_recipe "tools" -include_recipe "apache::ssl" +include_recipe "accounts" +include_recipe "apache" include_recipe "memcached" +include_recipe "postgresql" +include_recipe "python" +include_recipe "tools" + +package "python-dev" +package "libmysqlclient-dev" +package "libpq-dev" + +python_directory = "/opt/osqa-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" +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 + +python_package "html5lib" do + python_virtualenv python_directory + version "0.999" end apache_module "rewrite" apache_module "wsgi" node[:osqa][:sites].each do |site| - name = site[:name] - directory = site[:directory] || "/srv/#{name}" + 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) site_group = site[:group] || node[:osqa][:group] || Etc.getpwnam(site_user).gid site_group = Etc.getgrgid(site_group).name if site_group.is_a?(Integer) + database_cluster = site[:database_cluster] || node[:osqa][:database_cluster] database_name = site[:database_name] || node[:osqa][:database_name] database_user = site[:database_user] || node[:osqa][:database_user] database_password = site[:database_user] || node[:osqa][:database_password] backup_name = site[:backup] - apache_site name do + postgresql_user database_user do + cluster database_cluster + password database_password + end + + postgresql_database database_name do + cluster database_cluster + owner database_user + end + + ssl_certificate site_name do + 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 owner site_user group site_group - mode 0755 + mode "755" end execute "osqa-migrate" do @@ -72,8 +124,9 @@ 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" + depth 1 user site_user group site_group notifies :run, "execute[osqa-migrate]" @@ -82,14 +135,14 @@ node[:osqa][:sites].each do |site| directory "#{directory}/upfiles" do user site_user group site_group - mode 0755 + mode "755" end template "#{directory}/osqa/osqa.wsgi" do source "osqa.wsgi.erb" owner site_user group site_group - mode 0644 + mode "644" variables :directory => directory notifies :reload, "service[apache2]" end @@ -101,9 +154,9 @@ node[:osqa][:sites].each do |site| line.gsub!(/^( *)'PASSWORD': '.*',/, "\\1'PASSWORD': '#{database_password}',") line.gsub!(/^ALLOWED_HOSTS = .*/, "ALLOWED_HOSTS = ('help.openstreetmap.org',)") line.gsub!(/^CACHE_BACKEND = .*/, "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'") - line.gsub!(%r{^APP_URL = 'http://'}, "APP_URL = 'http://#{name}'") - line.gsub!(/^TIME_ZONE = 'America\/New_York'/, "TIME_ZONE = 'Europe/London'") - line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth']") + line.gsub!(%r{^APP_URL = 'http://'}, "APP_URL = 'https://#{site_name}'") + line.gsub!(%r{^TIME_ZONE = 'America/New_York'}, "TIME_ZONE = 'Europe/London'") + line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth', 'mysqlfulltext']") line end @@ -111,7 +164,7 @@ node[:osqa][:sites].each do |site| file "#{directory}/osqa/settings_local.py" do owner site_user group site_group - mode 0644 + mode "644" content settings notifies :reload, "service[apache2]" end @@ -120,7 +173,7 @@ node[:osqa][:sites].each do |site| source "backup.cron.erb" owner "root" group "root" - mode 0755 + mode "755" variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name end end