Revert "nominatim: improve IP query block expression"

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 225c26c73e064aca6d510e428941b716db85b6d2..cba5239ae962b429080b60e1aacd56af822d81a2 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -25,7 +25,6 @@ include_recipe "passenger"
 include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "memcached"
 include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "memcached"

-include_recipe "munin"

 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "php::fpm"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "php::fpm"


@@ -35,10 +34,69 @@ include_recipe "ruby"
 
 package %w[
   ant
 
 package %w[
   ant

+  apache2-dev
+  aria2
+  at
+  autoconf
+  automake
+  awscli
+  cmake
+  composer

   default-jdk-headless
   default-jre-headless
   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
   golang

-  composer
+  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
+  libbrotli-dev
+  libbytes-random-secure-perl
+  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
+  libxml-twig-perl
+  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-apcu
   php-cgi
   php-cli


@@ -55,8 +113,11 @@ package %w[
   php-pgsql
   php-sqlite3
   php-xml
   php-pgsql
   php-sqlite3
   php-xml

+  pigz

   pngcrush
   pngquant
   pngcrush
   pngquant

+  proj-bin
+  python-is-python3

   python3
   python3-brotli
   python3-bs4
   python3
   python3-brotli
   python3-bs4


@@ -64,69 +125,22 @@ package %w[
   python3-dateutil
   python3-dev
   python3-dotenv
   python3-dateutil
   python3-dev
   python3-dotenv

+  python3-gdal

   python3-lxml
   python3-lz4
   python3-magic
   python3-pil
   python3-psycopg2
   python3-pyproj
   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
-  libboost-date-time-dev
-  libboost-filesystem-dev
-  libboost-locale-dev
-  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
+  python3-venv
+  r-base
+  redis
+  tmux

   unrar
   unzip
   unrar
   unzip

-  zip
-  netcat
-  tmux

   whois
   whois

-  redis
-  r-base
-  pandoc
+  zip
+  zlib1g-dev

 ]
 
 # Add uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for reprojecting OS data
 ]
 
 # Add uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for reprojecting OS data


@@ -268,9 +282,9 @@ node[:postgresql][:versions].each do |version|
   package "postgresql-#{version}-postgis-3"
 end
 
   package "postgresql-#{version}-postgis-3"
 end
 

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


@@ -284,7 +298,7 @@ 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"
+    environment_file "/etc/default/rails-%i"

     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
     exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"
     user "apis"
     working_directory "/srv/%i.apis.dev.openstreetmap.org/rails"
     exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"


@@ -293,7 +307,10 @@ if node[:postgresql][:clusters][:"14/main"]
     sandbox :enable_network => true
     restrict_address_families "AF_UNIX"
     memory_deny_write_execute false
     sandbox :enable_network => true
     restrict_address_families "AF_UNIX"
     memory_deny_write_execute false

-    read_write_paths "/srv/%i.apis.dev.openstreetmap.org/logs"
+    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


@@ -301,16 +318,17 @@ if node[:postgresql][:clusters][:"14/main"]
     type "forking"
     environment_file "/etc/default/cgimap-%i"
     user "apis"
     type "forking"
     environment_file "/etc/default/cgimap-%i"
     user "apis"

-    exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/openstreetmap-cgimap --daemon --port $CGIMAP_PORT --instances 5"
+    group "www-data"
+    umask "0002"
+    exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/build/openstreetmap-cgimap --daemon --instances 5"

     exec_reload "/bin/kill -HUP $MAINPID"
     exec_reload "/bin/kill -HUP $MAINPID"

+    runtime_directory "cgimap-%i"

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

   Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |dir|
     node.default_unless[:dev][:rails][File.basename(dir).split(".").first] = {}
   end
   Dir.glob("/srv/*.apis.dev.openstreetmap.org").each do |dir|
     node.default_unless[:dev][:rails][File.basename(dir).split(".").first] = {}
   end


@@ -329,12 +347,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


@@ -369,13 +387,19 @@ if node[:postgresql][:clusters][:"14/main"]
         mode "755"
       end
 
         mode "755"
       end
 

+      openssl_rsa_private_key "#{site_directory}/doorkeeper.key" do
+        owner "root"
+        group "root"
+        mode "0400"
+      end
+

       rails_port site_name do
         directory rails_directory
         user "apis"
         group "apis"
         repository details[:repository]
         revision details[:revision]
       rails_port site_name do
         directory rails_directory
         user "apis"
         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>"


@@ -385,6 +409,7 @@ if node[:postgresql][:clusters][:"14/main"]
         csp_enforce true
         run_migrations true
         trace_use_job_queue true
         csp_enforce true
         run_migrations true
         trace_use_job_queue true

+        doorkeeper_signing_key lazy { File.read("#{site_directory}/doorkeeper.key") }

       end
 
       template "#{rails_directory}/config/initializers/setup.rb" do
       end
 
       template "#{rails_directory}/config/initializers/setup.rb" do


@@ -396,6 +421,14 @@ if node[:postgresql][:clusters][:"14/main"]
         notifies :restart, "rails_port[#{site_name}]"
       end
 
         notifies :restart, "rails_port[#{site_name}]"
       end
 

+      template "/etc/default/rails-#{name}" do
+        source "rails.environment.erb"
+        owner "root"
+        group "root"
+        mode "0600"
+        variables :secret_key_base => secret_key_base
+      end
+

       service "rails-jobs@#{name}" do
         action [:enable, :start]
         supports :restart => true
       service "rails-jobs@#{name}" do
         action [:enable, :start]
         supports :restart => true


@@ -413,31 +446,28 @@ if node[:postgresql][:clusters][:"14/main"]
           group "apis"
         end
 
           group "apis"
         end
 

-        execute "#{cgimap_directory}/autogen.sh" do
-          action :nothing
-          command "./autogen.sh"
-          cwd cgimap_directory
+        directory "#{cgimap_directory}/build" do

           user "apis"
           group "apis"
           user "apis"
           group "apis"

-          subscribes :run, "git[#{cgimap_directory}]", :immediately
+          mode "0755"

         end
 
         end
 

-        execute "#{cgimap_directory}/configure" do
+        execute "#{cgimap_directory}/CMakeLists.txt" do

           action :nothing
           action :nothing

-          command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu --enable-yajl"
-          cwd cgimap_directory
+          command "cmake .."
+          cwd "#{cgimap_directory}/build"

           user "apis"
           group "apis"
           user "apis"
           group "apis"

-          subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediately
+          subscribes :run, "git[#{cgimap_directory}]", :immediately

         end
 
         end
 

-        execute "#{cgimap_directory}/Makefile" do
+        execute "#{cgimap_directory}/build/Makefile" do

           action :nothing
           command "make -j"
           action :nothing
           command "make -j"

-          cwd cgimap_directory
+          cwd "#{cgimap_directory}/build"

           user "apis"
           group "apis"
           user "apis"
           group "apis"

-          subscribes :run, "execute[#{cgimap_directory}/configure]", :immediately
+          subscribes :run, "execute[#{cgimap_directory}/CMakeLists.txt]", :immediately

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


@@ -445,15 +475,16 @@ if node[:postgresql][:clusters][:"14/main"]
           owner "root"
           group "root"
           mode "640"
           owner "root"
           group "root"
           mode "640"

-          variables :cgimap_port => cgimap_port,
-                    :database_port => node[:postgresql][:clusters][:"14/main"][:port],
+          variables :cgimap_socket => "/run/cgimap-#{name}/socket",
+                    :database_port => node[:postgresql][:clusters][:"15/main"][:port],

                     :database_name => database_name,
                     :database_name => database_name,

-                    :log_directory => log_directory
+                    :log_directory => log_directory,
+                    :options => details[:cgimap_options]

         end
 
         service "cgimap@#{name}" do
           action [:start, :enable]
         end
 
         service "cgimap@#{name}" do
           action [:start, :enable]

-          subscribes :restart, "execute[#{cgimap_directory}/Makefile]"
+          subscribes :restart, "execute[#{cgimap_directory}/build/Makefile]"

           subscribes :restart, "template[/etc/default/cgimap-#{name}]"
           subscribes :restart, "systemd_service[cgimap@]"
         end
           subscribes :restart, "template[/etc/default/cgimap-#{name}]"
           subscribes :restart, "systemd_service[cgimap@]"
         end


@@ -470,7 +501,7 @@ if node[:postgresql][:clusters][:"14/main"]
                   :aliases => site_aliases,
                   :secret_key_base => secret_key_base,
                   :cgimap_enabled => details.key?(:cgimap_repository),
                   :aliases => site_aliases,
                   :secret_key_base => secret_key_base,
                   :cgimap_enabled => details.key?(:cgimap_repository),

-                  :cgimap_port => cgimap_port
+                  :cgimap_socket => "/run/cgimap-#{name}/socket"

       end
 
       template "/etc/logrotate.d/apis-#{name}" do
       end
 
       template "/etc/logrotate.d/apis-#{name}" do


@@ -482,8 +513,6 @@ if node[:postgresql][:clusters][:"14/main"]
                   :log_directory => log_directory,
                   :rails_directory => rails_directory
       end
                   :log_directory => log_directory,
                   :rails_directory => rails_directory
       end

-
-      cgimap_port += 1

     else
       file "/etc/logrotate.d/apis-#{name}" do
         action :delete
     else
       file "/etc/logrotate.d/apis-#{name}" do
         action :delete


@@ -516,7 +545,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


@@ -542,13 +571,6 @@ if node[:postgresql][:clusters][:"14/main"]
   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end
   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end

-
-  node[:postgresql][:clusters].each_key do |name|
-    postgresql_munin name do
-      cluster name
-      database "ALL"
-    end
-  end

 end
 
 directory "/srv/ooc.openstreetmap.org" do
 end
 
 directory "/srv/ooc.openstreetmap.org" do


@@ -578,3 +600,16 @@ end
 apache_site "ooc.openstreetmap.org" do
   template "apache.ooc.erb"
 end
 apache_site "ooc.openstreetmap.org" do
   template "apache.ooc.erb"
 end

+
+directory "/etc/systemd/system/user-.slice.d" do
+  owner "root"
+  group "root"
+  mode "0755"
+end
+
+template "/etc/systemd/system/user-.slice.d/99-chef.conf" do
+  source "user-slice.conf.erb"
+  owner "root"
+  group "root"
+  mode "0644"
+end