X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4e99c5be590629426248a522a1c09ce2ab9196d1..9e3d6bc2332036591015cf6171a685536e26b3c1:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index b6a11b905..9817e5b34 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,15 +20,16 @@
 require "yaml"
 require "securerandom"
 
+include_recipe "accounts"
 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "memcached"
-include_recipe "munin"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "php::fpm"
+include_recipe "podman"
 include_recipe "postgresql"
 include_recipe "python"
 include_recipe "ruby"
@@ -43,8 +44,10 @@ package %w[
   awscli
   cmake
   composer
+  curl
   default-jdk-headless
   default-jre-headless
+  eatmydata
   fonts-dejavu
   fonts-dejavu-core
   fonts-dejavu-extra
@@ -54,6 +57,7 @@ package %w[
   g++
   gcc
   gdal-bin
+  gfortran
   gnuplot-nox
   golang
   graphviz
@@ -67,6 +71,7 @@ package %w[
   libboost-program-options-dev
   libboost-regex-dev
   libboost-system-dev
+  libbrotli-dev
   libbytes-random-secure-perl
   libcairo2-dev
   libcrypto++-dev
@@ -91,8 +96,10 @@ package %w[
   mailutils
   make
   nano
-  netcat
+  ncftp
+  netcat-openbsd
   osm2pgsql
+  osmium-tool
   osmosis
   pandoc
   pandoc
@@ -117,6 +124,7 @@ package %w[
   pngcrush
   pngquant
   proj-bin
+  pyosmium
   python-is-python3
   python3
   python3-brotli
@@ -126,6 +134,7 @@ package %w[
   python3-dev
   python3-dotenv
   python3-gdal
+  python3-geojson
   python3-lxml
   python3-lz4
   python3-magic
@@ -151,10 +160,6 @@ end
 
 nodejs_package "svgo"
 
-python_package "geojson" do
-  python_version "3"
-end
-
 apache_module "env"
 apache_module "expires"
 apache_module "headers"
@@ -320,7 +325,7 @@ if node[:postgresql][:clusters][:"15/main"]
     user "apis"
     group "www-data"
     umask "0002"
-    exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/openstreetmap-cgimap --daemon --instances 5"
+    exec_start "/srv/%i.apis.dev.openstreetmap.org/cgimap/build/openstreetmap-cgimap --daemon --instances 5"
     exec_reload "/bin/kill -HUP $MAINPID"
     runtime_directory "cgimap-%i"
     sandbox :enable_network => true
@@ -446,31 +451,28 @@ if node[:postgresql][:clusters][:"15/main"]
           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"
-          subscribes :run, "git[#{cgimap_directory}]", :immediately
+          mode "0755"
         end
 
-        execute "#{cgimap_directory}/configure" do
+        execute "#{cgimap_directory}/CMakeLists.txt" do
           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"
-          subscribes :run, "execute[#{cgimap_directory}/autogen.sh]", :immediately
+          subscribes :run, "git[#{cgimap_directory}]", :immediately
         end
 
-        execute "#{cgimap_directory}/Makefile" do
+        execute "#{cgimap_directory}/build/Makefile" do
           action :nothing
           command "make -j"
-          cwd cgimap_directory
+          cwd "#{cgimap_directory}/build"
           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
@@ -487,7 +489,7 @@ if node[:postgresql][:clusters][:"15/main"]
 
         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
@@ -574,13 +576,6 @@ if node[:postgresql][:clusters][:"15/main"]
   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