From a53bc02414ea4fabae92e6f4169c78b8f6ad46d0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Mar 2024 10:33:35 +0100 Subject: [PATCH 1/3] Add comment about rehosting files [ci skip] --- 4.4/init.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/4.4/init.sh b/4.4/init.sh index e3e32f30..ad8165da 100755 --- a/4.4/init.sh +++ b/4.4/init.sh @@ -11,6 +11,9 @@ if [ -z "$THREADS" ]; then THREADS=$(nproc) fi +# we re-host the files because inconsiderate users eat up all of nominatim.org's bandwidth +# https://github.com/mediagis/nominatim-docker/issues/416 + if [ "$IMPORT_WIKIPEDIA" = "true" ]; then echo "Downloading Wikipedia importance dump" ${SCP}:wikimedia-importance.sql.gz ${PROJECT_DIR}/wikimedia-importance.sql.gz From e846fc5eb5c896c1feb090d42dd839bc2808c91e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Mar 2024 11:00:44 +0100 Subject: [PATCH 2/3] Upgrade to Tiger 2023 --- 4.4/init.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/4.4/init.sh b/4.4/init.sh index ad8165da..b4a351f3 100755 --- a/4.4/init.sh +++ b/4.4/init.sh @@ -11,7 +11,8 @@ if [ -z "$THREADS" ]; then THREADS=$(nproc) fi -# we re-host the files because inconsiderate users eat up all of nominatim.org's bandwidth +# we re-host the files on a Hetzner storage box because inconsiderate users eat up all of +# nominatim.org's bandwidth # https://github.com/mediagis/nominatim-docker/issues/416 if [ "$IMPORT_WIKIPEDIA" = "true" ]; then @@ -43,7 +44,7 @@ else fi; if [ "$IMPORT_TIGER_ADDRESSES" = "true" ]; then - ${SCP}:tiger2021-nominatim-preprocessed.csv.tar.gz ${PROJECT_DIR}/tiger-nominatim-preprocessed.csv.tar.gz + ${SCP}:tiger2023-nominatim-preprocessed.csv.tar.gz ${PROJECT_DIR}/tiger-nominatim-preprocessed.csv.tar.gz elif [ -f "$IMPORT_TIGER_ADDRESSES" ]; then # use local file if asked ln -s "$IMPORT_TIGER_ADDRESSES" ${PROJECT_DIR}/tiger-nominatim-preprocessed.csv.tar.gz From 581d762b49bd776f1e38c8c58b0e5a4c553be11d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Mar 2024 11:24:40 +0100 Subject: [PATCH 3/3] Increase sleep --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7136f964..bee1dfc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -97,7 +97,7 @@ jobs: -p 8004:8080 \ --name nominatim \ nominatim & - sleep 5 + sleep 25 ./assert-non-empty-json "http://localhost:8004/search.php?q=avenue%20pasteur" ${{ matrix.nominatim.update_command }} ./assert-non-empty-json "http://localhost:8004/search.php?q=avenue%20pasteur"