X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d1b835abf6c54e768ead54dd0056011554ba0b71..cad29d0634cd10b0ee94e5e4974210e0ca01ae6f:/cookbooks/dev/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index be4e96c68..d623d05ff 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -31,6 +31,7 @@ include_recipe "nodejs" include_recipe "php::fpm" include_recipe "postgresql" include_recipe "python" +include_recipe "ruby" package %w[ php-cgi @@ -57,6 +58,7 @@ package %w[ autoconf automake libtool + libargon2-dev libfcgi-dev libxml2-dev libmemcached-dev @@ -69,6 +71,7 @@ package %w[ libpqxx-dev libcrypto++-dev libyajl-dev + libfmt-dev zlib1g-dev ] @@ -94,7 +97,10 @@ end package "apache2-suexec-pristine" php_fpm "default" do - template "fpm-default.conf.erb" + pm_max_children 10 + pm_start_servers 4 + pm_min_spare_servers 2 + pm_max_spare_servers 6 end php_fpm "www" do @@ -155,11 +161,27 @@ search(:accounts, "*:*").each do |account| next unless File.directory?("#{user_home}/public_html") - port = 7000 + account["uid"].to_i - php_fpm name do - template "fpm.conf.erb" - variables :user => name, :port => port + user name + group name + pm_max_children 10 + pm_start_servers 4 + pm_min_spare_servers 2 + pm_max_spare_servers 6 + pm_max_requests 10000 + request_terminate_timeout 1800 + environment "HOSTNAME" => "$HOSTNAME", + "PATH" => "/usr/local/bin:/usr/bin:/bin", + "TMP" => "/tmp", + "TMPDIR" => "/tmp", + "TEMP" => "/tmp" + php_values "max_execution_time" => "300", + "memory_limit" => "128M", + "post_max_size" => "32M", + "upload_max_filesize" => "32M" + php_admin_values "sendmail_path" => "/usr/sbin/sendmail -t -i -f #{name}@errol.openstreetmap.org", + "open_basedir" => "/home/#{name}/:/tmp/:/usr/share/php/" + php_flags "display_errors" => "on" end ssl_certificate "#{name}.dev.openstreetmap.org" do @@ -170,7 +192,7 @@ search(:accounts, "*:*").each do |account| apache_site "#{name}.dev.openstreetmap.org" do template "apache.user.erb" directory "#{user_home}/public_html" - variables :user => name, :port => port + variables :user => name end template "/etc/sudoers.d/#{name}" do @@ -182,9 +204,9 @@ search(:accounts, "*:*").each do |account| end end -if node[:postgresql][:clusters][:"12/main"] +if node[:postgresql][:clusters][:"14/main"] postgresql_user "apis" do - cluster "12/main" + cluster "14/main" end template "/usr/local/bin/cleanup-rails-assets" do @@ -195,14 +217,12 @@ if node[:postgresql][:clusters][:"12/main"] mode "755" 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" + exec_start "#{node[:ruby][:bundle]} exec rails jobs:work" restart "on-failure" private_tmp true private_devices true @@ -228,6 +248,10 @@ if node[:postgresql][:clusters][:"12/main"] cgimap_port = 9000 + Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |dir| + node.default_unless[:dev][:rails][File.basename(dir).split(".").first] = {} + end + node[:dev][:rails].each do |name, details| database_name = details[:database] || "apis_#{name}" site_name = "#{name}.apis.dev.openstreetmap.org" @@ -239,17 +263,15 @@ if node[:postgresql][:clusters][:"12/main"] if details[:repository] site_aliases = details[:aliases] || [] - secret_key_base = details[:secret_key_base] || SecureRandom.base64(96) - - node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base + secret_key_base = persistent_token("dev", "rails", name, "secret_key_base") postgresql_database database_name do - cluster "12/main" + cluster "14/main" owner "apis" end postgresql_extension "#{database_name}_btree_gist" do - cluster "12/main" + cluster "14/main" database database_name extension "btree_gist" end @@ -285,15 +307,15 @@ if node[:postgresql][:clusters][:"12/main"] end rails_port site_name do - ruby ruby_version directory rails_directory user "apis" group "apis" repository details[:repository] revision details[:revision] - database_port node[:postgresql][:clusters][:"12/main"][:port] + database_port node[:postgresql][:clusters][:"14/main"][:port] database_name database_name database_username "apis" + email_from "OpenStreetMap " gpx_dir gpx_directory log_path "#{log_directory}/rails.log" memcache_servers ["127.0.0.1"] @@ -334,7 +356,7 @@ if node[:postgresql][:clusters][:"12/main"] cwd cgimap_directory user "apis" group "apis" - subscribes :run, "git[#{cgimap_directory}]", :immediate + subscribes :run, "git[#{cgimap_directory}]", :immediately end execute "#{cgimap_directory}/configure" do @@ -343,7 +365,7 @@ if node[:postgresql][:clusters][:"12/main"] cwd cgimap_directory user "apis" group "apis" - subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediate + subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediately end execute "#{cgimap_directory}/Makefile" do @@ -352,7 +374,7 @@ if node[:postgresql][:clusters][:"12/main"] cwd cgimap_directory user "apis" group "apis" - subscribes :run, "execute[#{cgimap_directory}/configure]", :immediate + subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately notifies :restart, "service[cgimap@#{name}]" end @@ -362,7 +384,7 @@ if node[:postgresql][:clusters][:"12/main"] group "root" mode "640" variables :cgimap_port => cgimap_port, - :database_port => node[:postgresql][:clusters][:"12/main"][:port], + :database_port => node[:postgresql][:clusters][:"14/main"][:port], :database_name => database_name, :log_directory => log_directory notifies :restart, "service[cgimap@#{name}]" @@ -415,6 +437,10 @@ if node[:postgresql][:clusters][:"12/main"] action :delete end + service "rails-jobs@#{name}" do + action [:stop, :disable] + end + directory site_directory do action :delete recursive true @@ -426,10 +452,8 @@ if node[:postgresql][:clusters][:"12/main"] postgresql_database database_name do action :drop - cluster "12/main" + cluster "14/main" end - - node.normal[:dev][:rails].delete(name) end end