Update SST CLI

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 15e9e7bbf6f1d986d5eb9070dfd5a30053846763..9ad37bfc9b30f57732011b0d1afc7162f0e7b9a6 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -31,35 +31,59 @@ include_recipe "nodejs"
 include_recipe "php::fpm"
 include_recipe "postgresql"
 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
   autoconf
   automake
   libtool
+  libargon2-dev
   libfcgi-dev
   libxml2-dev
   libmemcached-dev
+  libboost-dev
   libboost-regex-dev
   libboost-system-dev
   libboost-program-options-dev
@@ -69,9 +93,48 @@ package %w[
   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
+  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
@@ -201,9 +264,13 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
-if node[:postgresql][:clusters][:"13/main"]
+node[:postgresql][:versions].each do |version|
+  package "postgresql-#{version}-postgis-3"
+end
+
+if node[:postgresql][:clusters][:"14/main"]
   postgresql_user "apis" do
-    cluster "13/main"
+    cluster "14/main"
   end
 
   template "/usr/local/bin/cleanup-rails-assets" do
@@ -214,19 +281,20 @@ if node[:postgresql][:clusters][:"13/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"
+    nice 10
     private_tmp true
     private_devices true
-    protect_system "full"
+    protect_system "strict"
     protect_home true
+    read_write_paths "/srv/%i.apis.dev.openstreetmap.org/logs"
     no_new_privileges true
   end
 
@@ -239,14 +307,19 @@ if node[:postgresql][:clusters][:"13/main"]
     exec_reload "/bin/kill -HUP $MAINPID"
     private_tmp true
     private_devices true
-    protect_system "full"
+    protect_system "strict"
     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
 
   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"
@@ -261,12 +334,12 @@ if node[:postgresql][:clusters][:"13/main"]
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
       postgresql_database database_name do
-        cluster "13/main"
+        cluster "14/main"
         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do
-        cluster "13/main"
+        cluster "14/main"
         database database_name
         extension "btree_gist"
       end
@@ -302,13 +375,12 @@ if node[:postgresql][:clusters][:"13/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][:"13/main"][:port]
+        database_port node[:postgresql][:clusters][:"14/main"][:port]
         database_name database_name
         database_username "apis"
         email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
@@ -352,7 +424,7 @@ if node[:postgresql][:clusters][:"13/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
@@ -361,7 +433,7 @@ if node[:postgresql][:clusters][:"13/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
@@ -370,7 +442,7 @@ if node[:postgresql][:clusters][:"13/main"]
           cwd cgimap_directory
           user "apis"
           group "apis"
-          subscribes :run, "execute[#{cgimap_directory}/configure]", :immediate
+          subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately
           notifies :restart, "service[cgimap@#{name}]"
         end
 
@@ -380,7 +452,7 @@ if node[:postgresql][:clusters][:"13/main"]
           group "root"
           mode "640"
           variables :cgimap_port => cgimap_port,
-                    :database_port => node[:postgresql][:clusters][:"13/main"][:port],
+                    :database_port => node[:postgresql][:clusters][:"14/main"][:port],
                     :database_name => database_name,
                     :log_directory => log_directory
           notifies :restart, "service[cgimap@#{name}]"
@@ -433,6 +505,10 @@ if node[:postgresql][:clusters][:"13/main"]
         action :delete
       end
 
+      service "rails-jobs@#{name}" do
+        action [:stop, :disable]
+      end
+
       directory site_directory do
         action :delete
         recursive true
@@ -444,7 +520,7 @@ if node[:postgresql][:clusters][:"13/main"]
 
       postgresql_database database_name do
         action :drop
-        cluster "13/main"
+        cluster "14/main"
       end
     end
   end