Switch to public overpass instance

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index f4fe890ccbec866202387da78f0358da5c431f5a..9ad37bfc9b30f57732011b0d1afc7162f0e7b9a6 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -34,6 +34,10 @@ include_recipe "python"
 include_recipe "ruby"
 
 package %w[
 include_recipe "ruby"
 
 package %w[

+  ant
+  default-jdk-headless
+  default-jre-headless
+  golang

   composer
   php-apcu
   php-cgi
   composer
   php-apcu
   php-cgi


@@ -54,12 +58,21 @@ package %w[
   pngcrush
   pngquant
   python3
   pngcrush
   pngquant
   python3

+  python3-brotli

   python3-bs4
   python3-cheetah
   python3-dateutil
   python3-bs4
   python3-cheetah
   python3-dateutil

+  python3-dev
+  python3-dotenv
+  python3-lxml
+  python3-lz4

   python3-magic
   python3-magic

+  python3-pil

   python3-psycopg2
   python3-psycopg2

+  python3-pyproj

   python3-gdal
   python3-gdal

+  gdal-bin
+  proj-bin

   g++
   gcc
   make
   g++
   gcc
   make


@@ -70,6 +83,7 @@ package %w[
   libfcgi-dev
   libxml2-dev
   libmemcached-dev
   libfcgi-dev
   libxml2-dev
   libmemcached-dev

+  libboost-dev

   libboost-regex-dev
   libboost-system-dev
   libboost-program-options-dev
   libboost-regex-dev
   libboost-system-dev
   libboost-program-options-dev


@@ -83,8 +97,44 @@ package %w[
   zlib1g-dev
   nano
   osm2pgsql
   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
 nodejs_package "svgo"
 
 python_package "geojson" do


@@ -214,6 +264,10 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
   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"
 if node[:postgresql][:clusters][:"14/main"]
   postgresql_user "apis" do
     cluster "14/main"


@@ -230,14 +284,17 @@ if node[:postgresql][:clusters][:"14/main"]
   systemd_service "rails-jobs@" do
     description "Rails job queue runner"
     type "simple"
   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"
     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
     exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"
     restart "on-failure"

+    nice 10

     private_tmp true
     private_devices true
     private_tmp true
     private_devices true

-    protect_system "full"
+    protect_system "strict"

     protect_home true
     protect_home true

+    read_write_paths "/srv/%i.apis.dev.openstreetmap.org/logs"

     no_new_privileges true
   end
 
     no_new_privileges true
   end
 


@@ -250,8 +307,9 @@ if node[:postgresql][:clusters][:"14/main"]
     exec_reload "/bin/kill -HUP $MAINPID"
     private_tmp true
     private_devices true
     exec_reload "/bin/kill -HUP $MAINPID"
     private_tmp true
     private_devices true

-    protect_system "full"
+    protect_system "strict"

     protect_home true
     protect_home true

+    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
     no_new_privileges true
     restart "on-failure"
   end