X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9504c62303d2a0f8c831b183f27b7cb072faccab..794cc957324de66edab45373053be3e601090f1f:/cookbooks/osqa/recipes/default.rb?ds=inline diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb index 72534683e..4cbd677a6 100644 --- a/cookbooks/osqa/recipes/default.rb +++ b/cookbooks/osqa/recipes/default.rb @@ -20,6 +20,7 @@ include_recipe "accounts" include_recipe "apache" include_recipe "memcached" +include_recipe "postgresql" include_recipe "python" include_recipe "tools" @@ -29,18 +30,15 @@ package "libpq-dev" python_directory = "/opt/osqa-python" -python_virtualenv python_directory +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 "html5lib" do - python_virtualenv python_directory - version "0.999" -end - python_package "Markdown" do python_virtualenv python_directory version "2.4" @@ -56,11 +54,6 @@ python_package "python-openid" do 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.7.6.1" @@ -71,6 +64,11 @@ python_package "South" do version "0.7.6" end +python_package "html5lib" do + python_virtualenv python_directory + version "0.999" +end + apache_module "rewrite" apache_module "wsgi" @@ -82,11 +80,22 @@ node[:osqa][:sites].each do |site| 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] + 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]" @@ -101,7 +110,7 @@ node[:osqa][:sites].each do |site| directory directory do owner site_user group site_group - mode 0o755 + mode "755" end execute "osqa-migrate" do @@ -126,14 +135,14 @@ node[:osqa][:sites].each do |site| 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 - mode 0o644 + mode "644" variables :directory => directory notifies :reload, "service[apache2]" end @@ -147,7 +156,7 @@ node[:osqa][:sites].each do |site| line.gsub!(/^CACHE_BACKEND = .*/, "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'") 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']") + line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth', 'mysqlfulltext']") line end @@ -155,7 +164,7 @@ node[:osqa][:sites].each do |site| file "#{directory}/osqa/settings_local.py" do owner site_user group site_group - mode 0o644 + mode "644" content settings notifies :reload, "service[apache2]" end @@ -164,7 +173,7 @@ node[:osqa][:sites].each do |site| 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