Merge remote-tracking branch 'github/pull/619'

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index d2477273d57e64c982b7a222ed110bac68c8440b..fd5db8de08fb1258417b399874833fc350de2909 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -34,49 +34,119 @@ include_recipe "python"
 include_recipe "ruby"
 
 package %w[
 include_recipe "ruby"
 
 package %w[

+  ant
+  apache2-dev
+  aria2
+  at
+  autoconf
+  automake
+  awscli
+  cmake
+  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
+  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
+  libcairo2-dev
+  libcrypto++-dev
+  libcurl4-openssl-dev
+  libfcgi-dev
+  libfmt-dev
+  libglib2.0-dev
+  libiniparser-dev
+  libjson-xs-perl
+  libmapnik-dev
+  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
   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
+  pigz

   pngcrush
   pngquant
   pngcrush
   pngquant

+  proj-bin
+  python-is-python3

   python3
   python3

+  python3-brotli

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

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

   python3-magic
   python3-magic

+  python3-pil

   python3-psycopg2
   python3-psycopg2

-  python3-gdal
-  g++
-  gcc
-  make
-  autoconf
-  automake
-  libtool
-  libargon2-dev
-  libfcgi-dev
-  libxml2-dev
-  libmemcached-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
+  python3-pyproj
+  python3-venv
+  r-base
+  redis
+  tmux
+  unrar
+  unzip
+  whois
+  zip

   zlib1g-dev
   zlib1g-dev

-  nano
-  osm2pgsql

 ]
 
 ]
 

+# 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


@@ -181,7 +251,7 @@ search(:accounts, "*:*").each do |account|
                "memory_limit" => "128M",
                "post_max_size" => "32M",
                "upload_max_filesize" => "32M"
                "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
                      "open_basedir" => "/home/#{name}/:/tmp/:/usr/share/php/"
     php_flags "display_errors" => "on"
   end


@@ -206,9 +276,13 @@ search(:accounts, "*:*").each do |account|
   end
 end
 
   end
 end
 

-if node[:postgresql][:clusters][:"14/main"]
+node[:postgresql][:versions].each do |version|
+  package "postgresql-#{version}-postgis-3"
+end
+
+if node[:postgresql][:clusters][:"15/main"]

   postgresql_user "apis" do
   postgresql_user "apis" do

-    cluster "14/main"
+    cluster "15/main"

   end
 
   template "/usr/local/bin/cleanup-rails-assets" do
   end
 
   template "/usr/local/bin/cleanup-rails-assets" do


@@ -222,15 +296,19 @@ 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"

-    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",
+      "/srv/%i.apis.dev.openstreetmap.org/rails/storage"
+    ]

   end
 
   systemd_service "cgimap@" do
   end
 
   systemd_service "cgimap@" do


@@ -240,11 +318,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"
     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
 
     restart "on-failure"
   end
 


@@ -268,12 +344,12 @@ if node[:postgresql][:clusters][:"14/main"]
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
       postgresql_database database_name do
       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
         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do

-        cluster "14/main"
+        cluster "15/main"

         database database_name
         extension "btree_gist"
       end
         database database_name
         extension "btree_gist"
       end


@@ -314,7 +390,7 @@ if node[:postgresql][:clusters][:"14/main"]
         group "apis"
         repository details[:repository]
         revision details[:revision]
         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 <web@noreply.openstreetmap.org>"
         database_name database_name
         database_username "apis"
         email_from "OpenStreetMap <web@noreply.openstreetmap.org>"


@@ -339,7 +415,7 @@ if node[:postgresql][:clusters][:"14/main"]
         action [:enable, :start]
         supports :restart => true
         subscribes :restart, "rails_port[#{site_name}]"
         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
 
         only_if "fgrep -q delayed_job #{rails_directory}/Gemfile.lock"
       end
 


@@ -377,7 +453,6 @@ if node[:postgresql][:clusters][:"14/main"]
           user "apis"
           group "apis"
           subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately
           user "apis"
           group "apis"
           subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately

-          notifies :restart, "service[cgimap@#{name}]"

         end
 
         template "/etc/default/cgimap-#{name}" do
         end
 
         template "/etc/default/cgimap-#{name}" do


@@ -386,14 +461,16 @@ if node[:postgresql][:clusters][:"14/main"]
           group "root"
           mode "640"
           variables :cgimap_port => cgimap_port,
           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
                     :database_name => database_name,
                     :log_directory => log_directory

-          notifies :restart, "service[cgimap@#{name}]"

         end
 
         service "cgimap@#{name}" do
           action [:start, :enable]
         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
 
         end
       end
 


@@ -454,7 +531,7 @@ if node[:postgresql][:clusters][:"14/main"]
 
       postgresql_database database_name do
         action :drop
 
       postgresql_database database_name do
         action :drop

-        cluster "14/main"
+        cluster "15/main"

       end
     end
   end
       end
     end
   end