X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aeaa46f3071de018b5c5e0f5678cb5b4082e3ddc..c35ef9359dee0c47c2b24faadde25619efaf42a6:/cookbooks/dev/recipes/default.rb?ds=inline diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 7fd25945c..fd5db8de0 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -31,47 +31,122 @@ include_recipe "nodejs" include_recipe "php::fpm" include_recipe "postgresql" include_recipe "python" +include_recipe "ruby" package %w[ + ant + apache2-dev + aria2 + at + autoconf + automake + awscli + cmake + composer + default-jdk-headless + default-jre-headless + fonts-dejavu + fonts-dejavu-core + fonts-dejavu-extra + fonts-droid-fallback + fonts-liberation + fonts-noto-mono + g++ + gcc + gdal-bin + gnuplot-nox + golang + graphviz + irssi + jq + libargon2-dev + libboost-date-time-dev + libboost-dev + libboost-filesystem-dev + libboost-locale-dev + libboost-program-options-dev + libboost-regex-dev + libboost-system-dev + libcairo2-dev + libcrypto++-dev + libcurl4-openssl-dev + libfcgi-dev + libfmt-dev + libglib2.0-dev + libiniparser-dev + libjson-xs-perl + libmapnik-dev + libmemcached-dev + libpqxx-dev + libtool + libxml2-dev + libyajl-dev + lua-any + luajit + lz4 + lzip + lzop + mailutils + make + nano + netcat + osm2pgsql + osmosis + pandoc + pandoc + pbzip2 + php-apcu php-cgi php-cli php-curl php-db + php-gd + php-igbinary php-imagick + php-intl + php-mbstring + php-memcache php-mysql php-pear php-pgsql php-sqlite3 + php-xml + pigz pngcrush pngquant + proj-bin + python-is-python3 python3 + python3-brotli python3-bs4 python3-cheetah python3-dateutil + python3-dev + python3-dotenv + python3-gdal + python3-lxml + python3-lz4 python3-magic + python3-pil python3-psycopg2 - python3-gdal - g++ - gcc - make - autoconf - automake - libtool - libfcgi-dev - libxml2-dev - libmemcached-dev - libboost-regex-dev - libboost-system-dev - libboost-program-options-dev - libboost-date-time-dev - libboost-filesystem-dev - libboost-locale-dev - libpqxx-dev - libcrypto++-dev - libyajl-dev + python3-pyproj + python3-venv + r-base + redis + tmux + unrar + unzip + whois + zip zlib1g-dev ] +# Add uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for reprojecting OS data +execute "uk_os_OSTN15_NTv2_OSGBtoETRS.tif" do + command "projsync --file uk_os_OSTN15_NTv2_OSGBtoETRS.tif --system-directory" + not_if { ::File.exist?("/usr/share/proj/uk_os_OSTN15_NTv2_OSGBtoETRS.tif") } +end + nodejs_package "svgo" python_package "geojson" do @@ -94,7 +169,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 +233,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}@dev.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 +264,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 +276,13 @@ search(:accounts, "*:*").each do |account| end end -if node[:postgresql][:clusters][:"12/main"] +node[:postgresql][:versions].each do |version| + package "postgresql-#{version}-postgis-3" +end + +if node[:postgresql][:clusters][:"15/main"] postgresql_user "apis" do - cluster "12/main" + cluster "15/main" end template "/usr/local/bin/cleanup-rails-assets" do @@ -195,20 +293,22 @@ 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" + environment "RAILS_ENV" => "production", "SLEEP_DELAY" => "60" 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 - protect_system "full" - protect_home true - no_new_privileges true + nice 10 + sandbox :enable_network => true + restrict_address_families "AF_UNIX" + memory_deny_write_execute false + read_write_paths [ + "/srv/%i.apis.dev.openstreetmap.org/logs", + "/srv/%i.apis.dev.openstreetmap.org/rails/storage" + ] end systemd_service "cgimap@" do @@ -218,16 +318,18 @@ if node[:postgresql][:clusters][:"12/main"] user "apis" exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/openstreetmap-cgimap --daemon --port $CGIMAP_PORT --instances 5" exec_reload "/bin/kill -HUP $MAINPID" - private_tmp true - private_devices true - protect_system "full" - protect_home true - no_new_privileges true + sandbox :enable_network => true + restrict_address_families "AF_UNIX" + read_write_paths ["/srv/%i.apis.dev.openstreetmap.org/logs", "/srv/%i.apis.dev.openstreetmap.org/rails/tmp"] restart "on-failure" end 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 +341,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 "15/main" owner "apis" end postgresql_extension "#{database_name}_btree_gist" do - cluster "12/main" + cluster "15/main" database database_name extension "btree_gist" end @@ -285,15 +385,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][:"15/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"] @@ -315,7 +415,7 @@ if node[:postgresql][:clusters][:"12/main"] action [:enable, :start] supports :restart => true subscribes :restart, "rails_port[#{site_name}]" - subscribes :restart, "systemd_service[#{name}]" + subscribes :restart, "systemd_service[rails-jobs@]" only_if "fgrep -q delayed_job #{rails_directory}/Gemfile.lock" end @@ -334,7 +434,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 +443,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,8 +452,7 @@ if node[:postgresql][:clusters][:"12/main"] cwd cgimap_directory user "apis" group "apis" - subscribes :run, "execute[#{cgimap_directory}/configure]", :immediate - notifies :restart, "service[cgimap@#{name}]" + subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately end template "/etc/default/cgimap-#{name}" do @@ -362,14 +461,16 @@ 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][:"15/main"][:port], :database_name => database_name, :log_directory => log_directory - notifies :restart, "service[cgimap@#{name}]" end service "cgimap@#{name}" do action [:start, :enable] + subscribes :restart, "execute[#{cgimap_directory}/Makefile]" + subscribes :restart, "template[/etc/default/cgimap-#{name}]" + subscribes :restart, "systemd_service[cgimap@]" end end @@ -415,6 +516,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 +531,8 @@ if node[:postgresql][:clusters][:"12/main"] postgresql_database database_name do action :drop - cluster "12/main" + cluster "15/main" end - - node.normal[:dev][:rails].delete(name) end end @@ -476,7 +579,7 @@ remote_directory "/srv/ooc.openstreetmap.org/html" do mode "755" files_owner "root" files_group "root" - files_mode 0o644 + files_mode "644" end ssl_certificate "ooc.openstreetmap.org" do