X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0b74dbe5b08ff797d3cbf2df5ebedfe5d9a26bec..3ce58498ba5e797dfb3963372fbd0ed6951479e3:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index d03b8b204..f42c22ee3 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,6 +20,7 @@
 require "yaml"
 require "securerandom"
 
+include_recipe "accounts"
 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "geoipupdate"
@@ -28,6 +29,7 @@ include_recipe "memcached"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "php::fpm"
+include_recipe "podman"
 include_recipe "postgresql"
 include_recipe "python"
 include_recipe "ruby"
@@ -42,8 +44,10 @@ package %w[
   awscli
   cmake
   composer
+  curl
   default-jdk-headless
   default-jre-headless
+  eatmydata
   fonts-dejavu
   fonts-dejavu-core
   fonts-dejavu-extra
@@ -53,9 +57,11 @@ package %w[
   g++
   gcc
   gdal-bin
+  gfortran
   gnuplot-nox
   golang
   graphviz
+  htop
   irssi
   jq
   libargon2-dev
@@ -82,6 +88,7 @@ package %w[
   libtool
   libxml-twig-perl
   libxml2-dev
+  libxml2-utils
   libyajl-dev
   lua-any
   luajit
@@ -89,14 +96,15 @@ package %w[
   lzip
   lzop
   mailutils
+  moreutils
   make
   nano
-  netcat
+  ncftp
+  netcat-openbsd
   osm2pgsql
   osmium-tool
   osmosis
   pandoc
-  pandoc
   pbzip2
   php-apcu
   php-cgi
@@ -128,6 +136,7 @@ package %w[
   python3-dev
   python3-dotenv
   python3-gdal
+  python3-geojson
   python3-lxml
   python3-lz4
   python3-magic
@@ -141,6 +150,7 @@ package %w[
   unrar
   unzip
   whois
+  xxd
   zip
   zlib1g-dev
 ]
@@ -153,10 +163,6 @@ end
 
 nodejs_package "svgo"
 
-python_package "geojson" do
-  python_version "3"
-end
-
 apache_module "env"
 apache_module "expires"
 apache_module "headers"
@@ -197,7 +203,7 @@ template "/srv/dev.openstreetmap.org/index.html" do
 end
 
 ssl_certificate "dev.openstreetmap.org" do
-  domains "dev.openstreetmap.org"
+  domains ["dev.openstreetmap.org", "dev.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
@@ -219,7 +225,7 @@ file "/etc/apache2/conf.d/phppgadmin" do
 end
 
 ssl_certificate "phppgadmin.dev.openstreetmap.org" do
-  domains "phppgadmin.dev.openstreetmap.org"
+  domains ["phppgadmin.dev.openstreetmap.org", "phppgadmin.dev.osm.org"]
   notifies :reload, "service[apache2]"
 end
 
@@ -345,7 +351,7 @@ if node[:postgresql][:clusters][:"15/main"]
     gpx_directory = "#{site_directory}/gpx"
 
     if details[:repository]
-      site_aliases = details[:aliases] || []
+      site_aliases = details[:aliases] || ["#{name}.apis.dev.osm.org"]
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
       postgresql_database database_name do
@@ -566,7 +572,7 @@ if node[:postgresql][:clusters][:"15/main"]
   end
 
   ssl_certificate "apis.dev.openstreetmap.org" do
-    domains "apis.dev.openstreetmap.org"
+    domains ["apis.dev.openstreetmap.org", "apis.dev.osm.org"]
     notifies :reload, "service[apache2]"
   end
 
@@ -595,7 +601,8 @@ ssl_certificate "ooc.openstreetmap.org" do
   domains ["ooc.openstreetmap.org",
            "a.ooc.openstreetmap.org",
            "b.ooc.openstreetmap.org",
-           "c.ooc.openstreetmap.org"]
+           "c.ooc.openstreetmap.org",
+           "ooc.osm.org"]
   notifies :reload, "service[apache2]"
 end