Update mkdocs version with ubuntu 24.04 (#1)

Andygol · May 13, 2024 · 74c5ec9 · 74c5ec9
1 parent c13dd34
commit 74c5ec9
Show file tree

Hide file tree

Showing 11 changed files with 747 additions and 19 deletions.
diff --git a/docs/assets/serving-tiles/ubuntu-22-04-deps.txt b/docs/assets/serving-tiles/ubuntu-22-04-deps.txt
@@ -1,11 +1,9 @@
-
+sudo apt update
 sudo apt upgrade && sudo apt install \
     screen locate libapache2-mod-tile renderd \
-    git tar unzip wget bzip2 apache2 lua5.1 \
+    git tar unzip wget bzip2  apache2 lua5.1 \
     mapnik-utils python3-mapnik python3-psycopg2 \
-    python3-yaml gdal-bin npm fonts-noto-cjk \
-    fonts-noto-hinted fonts-noto-unhinted \
-    fonts-unifont fonts-hanazono postgresql \
-    postgresql-contrib postgresql-14-postgis-3 \
-    postgis postgresql-14-postgis-3-scripts \
-    osm2pgsql net-tools curl
+    python3-yaml gdal-bin npm postgresql \
+    postgresql-contrib postgis postgresql-14-postgis-3 \
+    postgresql-14-postgis-3-scripts osm2pgsql \
+    net-tools curl
diff --git a/docs/assets/serving-tiles/ubuntu-24-04-deps.txt b/docs/assets/serving-tiles/ubuntu-24-04-deps.txt
@@ -0,0 +1,9 @@
+sudo apt update
+sudo apt upgrade && sudo apt install \
+    screen locate libapache2-mod-tile renderd \
+    git tar unzip wget bzip2 apache2 lua5.1 \
+    mapnik-utils python3-mapnik python3-psycopg2 \
+    python3-yaml gdal-bin npm node-carto \
+    postgresql postgresql-contrib postgis \
+    postgresql-16-postgis-3 postgresql-16-postgis-3-scripts \
+    osm2pgsql net-tools curl
diff --git a/docs/en/serving-tiles/manually-building-a-tile-server-ubuntu-24-04-lts.md b/docs/en/serving-tiles/manually-building-a-tile-server-ubuntu-24-04-lts.md
diff --git a/docs/en/serving-tiles/monitoring-using-munin.md b/docs/en/serving-tiles/monitoring-using-munin.md
@@ -5,7 +5,7 @@ lang: en
 
 # {{ title }}
 
-"Munin" can be used to monitor the activity of `renderd` and `mod_tile` on a server. Munin is available on a number of platforms; these instructions were tested on Ubuntu Linux 22.04 in June 2022.
+"Munin" can be used to monitor the activity of `renderd` and `mod_tile` on a server. Munin is available on a number of platforms; these instructions were tested on Ubuntu Linux 22.04 in June 2022 and Ubuntu Linux 24.04 in April 2024.
 
 First, install the necessary software:
 

diff --git a/docs/en/serving-tiles/updating-as-people-edit-osm2pgsql-replication.md b/docs/en/serving-tiles/updating-as-people-edit-osm2pgsql-replication.md
@@ -7,7 +7,7 @@ lang: en
 
 Every day there are millions of new map updates, so to prevent a map becoming "stale" you can refresh the data used to create map tiles regularly.
 
-Using `osm2pgsql` (version 1.4.2 or above) it's now much easier to do this than it was previously. Version 1.6.0 is distributed as part of Ubuntu 22.04; version 1.8.0 as part of Debian 12, and it can also be obtained by following [these instructions](https://osm2pgsql.org/doc/install.html){: target=_blank}. With `osm2pgsql` comes [osm2pgsql-replication](https://osm2pgsql.org/doc/manual.html#updating-an-existing-database){: target=_blank} - that provides a relatively simple way to keep a database up to date. A more flexible approach is to call `PyOsmium` directly - see [this guide](/serving-tiles/updating-as-people-edit-pyosmium.md) for how to do that.
+Using `osm2pgsql` (version 1.4.2 or above) it's now much easier to do this than it was previously. Version 1.6.0 is distributed as part of Ubuntu 22.04; version 1.8.0 as part of Debian 12; version 1.11.0 as part of Ubuntu 24.04, and it can also be obtained by following [these instructions](https://osm2pgsql.org/doc/install.html){: target=_blank}. With `osm2pgsql` comes [osm2pgsql-replication](https://osm2pgsql.org/doc/manual.html#updating-an-existing-database){: target=_blank} - that provides a relatively simple way to keep a database up to date. A more flexible approach is to call `PyOsmium` directly - see [this guide](/serving-tiles/updating-as-people-edit-pyosmium.md) for how to do that.
 
 It's possible to set up replication from many different sources. OpenStreetMap itself provides minutely, hourly and daily updates, and other sources such as Geofabrik can provide daily updates that match the regional data extracts available at [download.geofabrik.de](http://download.geofabrik.de/index.html){: target=_blank}.
 

diff --git a/docs/en/serving-tiles/updating-as-people-edit-pyosmium.md b/docs/en/serving-tiles/updating-as-people-edit-pyosmium.md
@@ -7,7 +7,7 @@ lang: en
 
 Every day there are millions of new map updates so to prevent a map becoming "stale" you can refresh the data used to create map tiles regularly.
 
-Using osm2pgsql (version 1.4.2 or above) it's now much easier to do this than it was previously. Suitable versions are distributed as part of Ubuntu 22.04 and Debian 12, and it can also be obtained by following [these instructions](https://osm2pgsql.org/doc/install.html){: target=_blank}.
+Using osm2pgsql (version 1.4.2 or above) it's now much easier to do this than it was previously. Suitable versions are distributed as part of Ubuntu 22.04 and 24.04, and Debian 12, and it can also be obtained by following [these instructions](https://osm2pgsql.org/doc/install.html){: target=_blank}.
 
 A simpler, but less flexible, method to update a database is to use `osm2pgsql-replication`, described [here](/serving-tiles/updating-as-people-edit-osm2pgsql-replication.md). In this example, we'll use `PyOsmium` to update a database initially loaded from Geofabrik with minutely updates from <https://planet.openstreetmap.org>{: target=_blank}.