X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/844fb4d99d4e99ccf8a87d49ceb6b7ae28a67702..3c0e9a8a3178545962f25797d00d0edf9d8cd1fe:/cookbooks/dev/recipes/default.rb?ds=inline

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index d33534491..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"
@@ -571,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