X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/82de8d288c5ab65f843e68f5cd63eda7a6397909..d8e4ffc098e0c3e509b4231508a44d5b0f887897:/cookbooks/dev/recipes/default.rb diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index a7cbc5f51..7ad5eafcb 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: dev +# Cookbook:: dev # 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. @@ -22,20 +22,21 @@ require "securerandom" include_recipe "apache" include_recipe "passenger" +include_recipe "geoipupdate" include_recipe "git" include_recipe "memcached" +include_recipe "munin" include_recipe "mysql" include_recipe "nodejs" +include_recipe "php::fpm" include_recipe "postgresql" include_recipe "python" package %w[ - php php-cgi php-cli php-curl php-db - php-fpm php-imagick php-mysql php-pear @@ -88,21 +89,12 @@ apache_module "wsgi" package "apache2-suexec-pristine" -service "php7.2-fpm" do - action [:enable, :start] +php_fpm "default" do + template "fpm-default.conf.erb" end -template "/etc/php/7.2/fpm/pool.d/default.conf" do - source "fpm-default.conf.erb" - owner "root" - group "root" - mode 0o644 - notifies :reload, "service[php7.2-fpm]" -end - -file "/etc/php/7.2/fpm/pool.d/www.conf" do +php_fpm "www" do action :delete - notifies :reload, "service[php7.2-fpm]" end directory "/srv/dev.openstreetmap.org" do @@ -161,13 +153,9 @@ search(:accounts, "*:*").each do |account| port = 7000 + account["uid"].to_i - template "/etc/php/7.2/fpm/pool.d/#{name}.conf" do - source "fpm.conf.erb" - owner "root" - group "root" - mode 0o644 + php_fpm name do + template "fpm.conf.erb" variables :user => name, :port => port - notifies :reload, "service[php7.2-fpm]" end ssl_certificate "#{name}.dev.openstreetmap.org" do @@ -190,9 +178,9 @@ search(:accounts, "*:*").each do |account| end end -if node[:postgresql][:clusters][:"9.5/main"] +if node[:postgresql][:clusters][:"12/main"] postgresql_user "apis" do - cluster "9.5/main" + cluster "12/main" end template "/usr/local/bin/cleanup-rails-assets" do @@ -203,6 +191,22 @@ if node[:postgresql][:clusters][:"9.5/main"] mode 0o755 end + ruby_version = node[:passenger][:ruby_version] + + systemd_service "rails-jobs@" do + description "Rails job queue runner" + type "simple" + user "apis" + working_directory "/srv/%i.apis.dev.openstreetmap.org/rails" + exec_start "/usr/local/bin/bundle#{ruby_version} exec rake jobs:work" + restart "on-failure" + private_tmp true + private_devices true + protect_system "full" + protect_home true + no_new_privileges true + end + systemd_service "cgimap@" do description "OpenStreetMap API Server" type "forking" @@ -227,6 +231,7 @@ if node[:postgresql][:clusters][:"9.5/main"] log_directory = "#{site_directory}/logs" rails_directory = "#{site_directory}/rails" cgimap_directory = "#{site_directory}/cgimap" + gpx_directory = "#{site_directory}/gpx" if details[:repository] site_aliases = details[:aliases] || [] @@ -235,12 +240,12 @@ if node[:postgresql][:clusters][:"9.5/main"] node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base postgresql_database database_name do - cluster "9.5/main" + cluster "12/main" owner "apis" end postgresql_extension "#{database_name}_btree_gist" do - cluster "9.5/main" + cluster "12/main" database database_name extension "btree_gist" end @@ -257,20 +262,40 @@ if node[:postgresql][:clusters][:"9.5/main"] mode 0o755 end + directory gpx_directory do + owner "apis" + group "apis" + mode 0o755 + end + + directory "#{gpx_directory}/traces" do + owner "apis" + group "apis" + mode 0o755 + end + + directory "#{gpx_directory}/images" do + owner "apis" + group "apis" + mode 0o755 + end + rails_port site_name do - ruby node[:passenger][:ruby_version] + ruby ruby_version directory rails_directory user "apis" group "apis" repository details[:repository] revision details[:revision] - database_port node[:postgresql][:clusters][:"9.5/main"][:port] + database_port node[:postgresql][:clusters][:"12/main"][:port] database_name database_name database_username "apis" + gpx_dir gpx_directory log_path "#{log_directory}/rails.log" memcache_servers ["127.0.0.1"] csp_enforce true run_migrations true + trace_use_job_queue true end template "#{rails_directory}/config/initializers/setup.rb" do @@ -282,6 +307,14 @@ if node[:postgresql][:clusters][:"9.5/main"] notifies :restart, "rails_port[#{site_name}]" end + service "rails-jobs@#{name}" do + action [:enable, :start] + supports :restart => true + subscribes :restart, "rails_port[#{site_name}]" + subscribes :restart, "systemd_service[#{name}]" + only_if "fgrep -q delayed_job #{rails_directory}/Gemfile.lock" + end + if details[:cgimap_repository] git cgimap_directory do action :sync @@ -325,7 +358,7 @@ if node[:postgresql][:clusters][:"9.5/main"] group "root" mode 0o640 variables :cgimap_port => cgimap_port, - :database_port => node[:postgresql][:clusters][:"9.5/main"][:port], + :database_port => node[:postgresql][:clusters][:"12/main"][:port], :database_name => database_name, :log_directory => log_directory notifies :restart, "service[cgimap@#{name}]" @@ -389,7 +422,7 @@ if node[:postgresql][:clusters][:"9.5/main"] postgresql_database database_name do action :drop - cluster "9.5/main" + cluster "12/main" end node.normal[:dev][:rails].delete(name)