From b49cedd62a230a448bcb49ac80ddd0ac5cef60b4 Mon Sep 17 00:00:00 2001
From: Roland <roland@learningselfreliance.com>
Date: Wed, 22 Jan 2025 08:33:33 -0700
Subject: [PATCH] Forcing utf8 for map database.

---
 debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot | 2 +-
 pi-gen/stage2/04-wrolpi/04-run-chroot.sh                       | 2 +-
 scripts/initialize_map_db.sh                                   | 2 +-
 wrolpi/scripts/migrate_map_db.sh                               | 2 +-
 wrolpi/version.txt                                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot
index 4fbbeebb..dad3fded 100644
--- a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot
+++ b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot
@@ -38,7 +38,7 @@ chmod 0440 /etc/sudoers.d/90-wrolpi
 visudo -c -f /etc/sudoers.d/90-wrolpi
 
 # Create postgres cluster for map.
-pg_createcluster 15 map --port=5433
+pg_createcluster 15 map --port=5433 -e utf8
 
 git clone https://github.com/lrnselfreliance/openstreetmap-carto.git /opt/openstreetmap-carto
 git config --global --add safe.directory /opt/openstreetmap-carto
diff --git a/pi-gen/stage2/04-wrolpi/04-run-chroot.sh b/pi-gen/stage2/04-wrolpi/04-run-chroot.sh
index d95aa058..48edd35d 100755
--- a/pi-gen/stage2/04-wrolpi/04-run-chroot.sh
+++ b/pi-gen/stage2/04-wrolpi/04-run-chroot.sh
@@ -4,7 +4,7 @@ set -e
 set -x
 
 # Create postgres cluster for map.
-pg_createcluster 15 map --port=5433
+pg_createcluster 15 map --port=5433 -e utf8
 
 # Create mapnik config.
 git clone https://github.com/lrnselfreliance/openstreetmap-carto.git /opt/openstreetmap-carto
diff --git a/scripts/initialize_map_db.sh b/scripts/initialize_map_db.sh
index 420f90d2..3dd04461 100755
--- a/scripts/initialize_map_db.sh
+++ b/scripts/initialize_map_db.sh
@@ -13,7 +13,7 @@ set -x
 systemctl stop renderd
 
 # Create map database if it does not exist.
-pg_createcluster 15 map --port=5433 --start
+pg_createcluster 15 map --port=5433 --start -e utf8
 
 # Create gis (map) database.
 sudo -iu postgres psql -c '\l' --port=5433 | grep gis || (
diff --git a/wrolpi/scripts/migrate_map_db.sh b/wrolpi/scripts/migrate_map_db.sh
index 1309617a..e4c5a507 100755
--- a/wrolpi/scripts/migrate_map_db.sh
+++ b/wrolpi/scripts/migrate_map_db.sh
@@ -26,7 +26,7 @@ cleanup
 systemctl stop renderd
 
 # Create new cluster for the map.
-pg_createcluster 15 map --port=5433 --start
+pg_createcluster 15 map --port=5433 --start -e utf8
 # Disable JIT as recommended by mod_tile
 sed -i 's/#jit =.*/jit = off/' /etc/postgresql/15/map/postgresql.conf
 
diff --git a/wrolpi/version.txt b/wrolpi/version.txt
index 2f3f9910..15c61978 100644
--- a/wrolpi/version.txt
+++ b/wrolpi/version.txt
@@ -1 +1 @@
-0.15.2-beta
\ No newline at end of file
+0.15.3-beta
\ No newline at end of file