X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9b180c8f97133f80c6fd858e32728c8f1efd2768..a4b6110fe9d1c948b208869acc7db7a69ce46e91:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index d623d05ff..225c26c73 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -34,24 +34,45 @@ include_recipe "python"
 include_recipe "ruby"
 
 package %w[
+  ant
+  default-jdk-headless
+  default-jre-headless
+  golang
+  composer
+  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
   pngcrush
   pngquant
   python3
+  python3-brotli
   python3-bs4
   python3-cheetah
   python3-dateutil
+  python3-dev
+  python3-dotenv
+  python3-lxml
+  python3-lz4
   python3-magic
+  python3-pil
   python3-psycopg2
+  python3-pyproj
   python3-gdal
+  gdal-bin
+  proj-bin
   g++
   gcc
   make
@@ -62,6 +83,7 @@ package %w[
   libfcgi-dev
   libxml2-dev
   libmemcached-dev
+  libboost-dev
   libboost-regex-dev
   libboost-system-dev
   libboost-program-options-dev
@@ -73,8 +95,46 @@ package %w[
   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
+  unrar
+  unzip
+  zip
+  netcat
+  tmux
+  whois
+  redis
+  r-base
+  pandoc
 ]
 
+# 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
@@ -179,7 +239,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
@@ -204,6 +264,10 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
+node[:postgresql][:versions].each do |version|
+  package "postgresql-#{version}-postgis-3"
+end
+
 if node[:postgresql][:clusters][:"14/main"]
   postgresql_user "apis" do
     cluster "14/main"
@@ -220,15 +284,16 @@ if node[:postgresql][:clusters][:"14/main"]
   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 "#{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"
   end
 
   systemd_service "cgimap@" do
@@ -238,11 +303,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 "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
 
@@ -337,7 +400,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
 
@@ -375,7 +438,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
@@ -387,11 +449,13 @@ if node[:postgresql][:clusters][:"14/main"]
                     :database_port => node[:postgresql][:clusters][:"14/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