Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mkdocs version with ubuntu 24.04 #1

Merged
merged 13 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions docs/assets/serving-tiles/ubuntu-22-04-deps.txt
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions docs/assets/serving-tiles/ubuntu-24-04-deps.txt
Original file line number Diff line number Diff line change
@@ -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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/en/serving-tiles/monitoring-using-munin.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}.

Expand Down
2 changes: 1 addition & 1 deletion docs/en/serving-tiles/updating-as-people-edit-pyosmium.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}.

Expand Down
Loading