X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/265658e454497081b48c3f28772a7c3a091d5579..d5d78aa42c55fcf94c90655a19030bb7da65eeda:/cookbooks/dev/recipes/default.rb?ds=inline diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 9ad37bfc9..4874dc66a 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -35,10 +35,59 @@ include_recipe "ruby" package %w[ ant + aria2 + at + autoconf + automake + awscli + 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 - composer + 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 + libcrypto++-dev + libfcgi-dev + libfmt-dev + libjson-xs-perl + 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 @@ -55,8 +104,11 @@ package %w[ php-pgsql php-sqlite3 php-xml + pigz pngcrush pngquant + proj-bin + python-is-python3 python3 python3-brotli python3-bs4 @@ -64,69 +116,22 @@ package %w[ python3-dateutil python3-dev python3-dotenv + python3-gdal python3-lxml python3-lz4 python3-magic python3-pil python3-psycopg2 python3-pyproj - python3-gdal - gdal-bin - proj-bin - g++ - gcc - make - autoconf - automake - libtool - libargon2-dev - libfcgi-dev - libxml2-dev - libmemcached-dev - libboost-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 - libfmt-dev - zlib1g-dev - nano - osm2pgsql - osmosis - at - awscli - mailutils - lua-any - luajit - fonts-dejavu - fonts-dejavu-core - fonts-dejavu-extra - fonts-droid-fallback - fonts-liberation - fonts-noto-mono - gnuplot-nox - graphviz - irssi - jq - lz4 - lzip - lzop - pbzip2 - pigz + python3-venv + r-base + redis + tmux unrar unzip - zip - netcat - tmux whois - redis - r-base - pandoc + zip + zlib1g-dev ] # Add uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for reprojecting OS data @@ -239,7 +244,7 @@ search(:accounts, "*:*").each do |account| "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", + 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 @@ -268,9 +273,9 @@ node[:postgresql][:versions].each do |version| package "postgresql-#{version}-postgis-3" end -if node[:postgresql][:clusters][:"14/main"] +if node[:postgresql][:clusters][:"15/main"] postgresql_user "apis" do - cluster "14/main" + cluster "15/main" end template "/usr/local/bin/cleanup-rails-assets" do @@ -290,12 +295,10 @@ if node[:postgresql][:clusters][:"14/main"] exec_start "#{node[:ruby][:bundle]} exec rails jobs:work" restart "on-failure" nice 10 - private_tmp true - private_devices true - protect_system "strict" - protect_home true + sandbox :enable_network => true + restrict_address_families "AF_UNIX" + memory_deny_write_execute false read_write_paths "/srv/%i.apis.dev.openstreetmap.org/logs" - no_new_privileges true end systemd_service "cgimap@" do @@ -305,12 +308,9 @@ if node[:postgresql][:clusters][:"14/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 "strict" - protect_home 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"] - no_new_privileges true restart "on-failure" end @@ -334,12 +334,12 @@ if node[:postgresql][:clusters][:"14/main"] secret_key_base = persistent_token("dev", "rails", name, "secret_key_base") postgresql_database database_name do - cluster "14/main" + cluster "15/main" owner "apis" end postgresql_extension "#{database_name}_btree_gist" do - cluster "14/main" + cluster "15/main" database database_name extension "btree_gist" end @@ -380,7 +380,7 @@ if node[:postgresql][:clusters][:"14/main"] group "apis" repository details[:repository] revision details[:revision] - database_port node[:postgresql][:clusters][:"14/main"][:port] + database_port node[:postgresql][:clusters][:"15/main"][:port] database_name database_name database_username "apis" email_from "OpenStreetMap " @@ -405,7 +405,7 @@ if node[:postgresql][:clusters][:"14/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 @@ -443,7 +443,6 @@ if node[:postgresql][:clusters][:"14/main"] user "apis" group "apis" subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately - notifies :restart, "service[cgimap@#{name}]" end template "/etc/default/cgimap-#{name}" do @@ -452,14 +451,16 @@ if node[:postgresql][:clusters][:"14/main"] group "root" mode "640" variables :cgimap_port => cgimap_port, - :database_port => node[:postgresql][:clusters][:"14/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 @@ -520,7 +521,7 @@ if node[:postgresql][:clusters][:"14/main"] postgresql_database database_name do action :drop - cluster "14/main" + cluster "15/main" end end end