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

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index e4a977f8a225487b385da6843a8f383942fb0270..b8c58979679d8b78f652c7785a149799d471a33b 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -31,35 +31,61 @@ 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
   pngcrush
   pngquant

+  python-is-python3

   python3
   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-venv
+  python3-pyproj

   python3-gdal
   python3-gdal

+  gdal-bin
+  proj-bin

   g++
   gcc
   make
   autoconf
   automake
   libtool
   g++
   gcc
   make
   autoconf
   automake
   libtool

+  libargon2-dev

   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


@@ -69,9 +95,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


@@ -176,7 +241,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


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

-if node[:postgresql][:clusters][:"12/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 "12/main"
+    cluster "15/main"

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


@@ -214,20 +283,19 @@ if node[:postgresql][:clusters][:"12/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"

-    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
   end
 
   systemd_service "cgimap@" do


@@ -237,16 +305,18 @@ if node[:postgresql][:clusters][:"12/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
 
   cgimap_port = 9000
 
     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"
   node[:dev][:rails].each do |name, details|
     database_name = details[:database] || "apis_#{name}"
     site_name = "#{name}.apis.dev.openstreetmap.org"


@@ -261,12 +331,12 @@ if node[:postgresql][:clusters][:"12/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 "12/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 "12/main"
+        cluster "15/main"

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


@@ -302,13 +372,12 @@ if node[:postgresql][:clusters][:"12/main"]
       end
 
       rails_port site_name do
       end
 
       rails_port site_name do

-        ruby ruby_version

         directory rails_directory
         user "apis"
         group "apis"
         repository details[:repository]
         revision details[:revision]
         directory rails_directory
         user "apis"
         group "apis"
         repository details[:repository]
         revision details[:revision]

-        database_port node[:postgresql][:clusters][:"12/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>"


@@ -333,7 +402,7 @@ if node[:postgresql][:clusters][:"12/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
 


@@ -352,7 +421,7 @@ if node[:postgresql][:clusters][:"12/main"]
           cwd cgimap_directory
           user "apis"
           group "apis"
           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
         end
 
         execute "#{cgimap_directory}/configure" do


@@ -361,7 +430,7 @@ if node[:postgresql][:clusters][:"12/main"]
           cwd cgimap_directory
           user "apis"
           group "apis"
           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
         end
 
         execute "#{cgimap_directory}/Makefile" do


@@ -370,8 +439,7 @@ if node[:postgresql][:clusters][:"12/main"]
           cwd cgimap_directory
           user "apis"
           group "apis"
           cwd cgimap_directory
           user "apis"
           group "apis"

-          subscribes :run, "execute[#{cgimap_directory}/configure]", :immediate
-          notifies :restart, "service[cgimap@#{name}]"
+          subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately

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


@@ -380,14 +448,16 @@ if node[:postgresql][:clusters][:"12/main"]
           group "root"
           mode "640"
           variables :cgimap_port => cgimap_port,
           group "root"
           mode "640"
           variables :cgimap_port => cgimap_port,

-                    :database_port => node[:postgresql][:clusters][:"12/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
 


@@ -433,6 +503,10 @@ if node[:postgresql][:clusters][:"12/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


@@ -444,7 +518,7 @@ if node[:postgresql][:clusters][:"12/main"]
 
       postgresql_database database_name do
         action :drop
 
       postgresql_database database_name do
         action :drop

-        cluster "12/main"
+        cluster "15/main"

       end
     end
   end
       end
     end
   end