X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/59df18a47e1431952fcf82ca8ab318c2566370dc..4e38812ed90eda5b66f0c42b006a1e923cbdd0db:/cookbooks/osqa/recipes/default.rb?ds=inline diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb index 766f2f4b0..6e8d00d4a 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, @@ -18,29 +18,65 @@ # 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.7.6.1" +end + +python_package "South" do + python_virtualenv python_directory + version "0.7.6" end apache_module "rewrite" apache_module "wsgi" node[:osqa][:sites].each do |site| - name = site[:name] - directory = site[:directory] || "/var/www/#{name}" - osqa_revision = site[:revision] || node[:osqa][:revision] + 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 @@ -48,11 +84,23 @@ node[:osqa][:sites].each do |site| 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 + 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}/osqa" - variables :user => site_user, :group => site_group + directory directory + 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 0o755 end execute "osqa-migrate" do @@ -61,35 +109,31 @@ node[:osqa][:sites].each do |site| cwd "#{directory}/osqa" user site_user group site_group - notifies :reload, resources(:service => "apache2") + notifies :reload, "service[apache2]" end - subversion "#{directory}/osqa" do + git "#{directory}/osqa" do action :sync - repository "http://svn.osqa.net/svnroot/osqa/trunk" - revision osqa_revision + repository "https://git.openstreetmap.org/public/osqa.git" + revision "live" user site_user group site_group - notifies :run, resources(:execute => "osqa-migrate") + notifies :run, "execute[osqa-migrate]" end - remote_directory "#{directory}/osqa/forum_modules/osmauth" do - source "osmauth" - owner site_user + directory "#{directory}/upfiles" do + user site_user group site_group - mode 0755 - files_owner site_user - files_group site_group - files_mode 0644 + mode 0o755 end template "#{directory}/osqa/osqa.wsgi" do source "osqa.wsgi.erb" owner site_user group site_group - mode 0644 + mode 0o644 variables :directory => directory - notifies :reload, resources(:service => "apache2") + notifies :reload, "service[apache2]" end settings = edit_file "#{directory}/osqa/settings_local.py.dist" do |line| @@ -97,9 +141,10 @@ node[:osqa][:sites].each do |site| line.gsub!(/^( *)'NAME': '.*',/, "\\1'NAME': '#{database_name}',") line.gsub!(/^( *)'USER': '.*',/, "\\1'USER': '#{database_user}',") 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!(/^APP_URL = 'http:\/\/'/, "APP_URL = 'http://#{name}'") - line.gsub!(/^TIME_ZONE = 'America\/New_York'/, "TIME_ZONE = 'Europe/London'") + 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 @@ -108,8 +153,16 @@ node[:osqa][:sites].each do |site| file "#{directory}/osqa/settings_local.py" do owner site_user group site_group - mode 0644 + mode 0o644 content settings - notifies :reload, resources(:service => "apache2") + notifies :reload, "service[apache2]" + end + + template "/etc/cron.daily/#{backup_name}-backup" do + source "backup.cron.erb" + owner "root" + group "root" + mode 0o755 + variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name end end