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 d7d88656a688ca6b995ad7d1d0a5e7d4f4b6f14b..9ad37bfc9b30f57732011b0d1afc7162f0e7b9a6 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -31,26 +31,48 @@ include_recipe "nodejs"
 include_recipe "php::fpm"
 include_recipe "postgresql"
 include_recipe "python"
 include_recipe "php::fpm"
 include_recipe "postgresql"
 include_recipe "python"

+include_recipe "ruby"

 
 package %w[
 
 package %w[

+  ant
+  default-jdk-headless
+  default-jre-headless
+  golang
+  composer
+  php-apcu

   php-cgi
   php-cli
   php-curl
   php-db
   php-cgi
   php-cli
   php-curl
   php-db

+  php-gd
+  php-igbinary

   php-imagick
   php-imagick

+  php-intl
+  php-mbstring
+  php-memcache

   php-mysql
   php-pear
   php-pgsql
   php-sqlite3
   php-mysql
   php-pear
   php-pgsql
   php-sqlite3

+  php-xml

   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


@@ -61,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


@@ -70,9 +93,48 @@ package %w[
   libpqxx-dev
   libcrypto++-dev
   libyajl-dev
   libpqxx-dev
   libcrypto++-dev
   libyajl-dev

+  libfmt-dev

   zlib1g-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
 nodejs_package "svgo"
 
 python_package "geojson" do


@@ -202,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"


@@ -215,19 +281,20 @@ if node[:postgresql][:clusters][:"14/main"]
     mode "755"
   end
 
     mode "755"
   end
 

-  ruby_version = node[:passenger][:ruby_version]
-

   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"
     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"
     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
 


@@ -240,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


@@ -307,7 +375,6 @@ if node[:postgresql][:clusters][:"14/main"]
       end
 
       rails_port site_name do
       end
 
       rails_port site_name do

-        ruby ruby_version

         directory rails_directory
         user "apis"
         group "apis"
         directory rails_directory
         user "apis"
         group "apis"


@@ -438,6 +505,10 @@ if node[:postgresql][:clusters][:"14/main"]
         action :delete
       end
 
         action :delete
       end
 

+      service "rails-jobs@#{name}" do
+        action [:stop, :disable]
+      end
+

       directory site_directory do
         action :delete
         recursive true
       directory site_directory do
         action :delete
         recursive true