Actually allow modifying the replication URL (#297)

Overv · Jul 22, 2022 · 25a661e · 25a661e
1 parent 67d127b
commit 25a661e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -34,6 +34,9 @@ FROM ubuntu:22.04 AS final
 ENV DEBIAN_FRONTEND=noninteractive
 ENV AUTOVACUUM=on
 ENV UPDATES=disabled
+ENV REPLICATION_URL=https://planet.openstreetmap.org/replication/hour/
+ENV MAX_INTERVAL_SECONDS=3600
+
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Get packages

diff --git a/openstreetmap-tiles-update-expire.sh b/openstreetmap-tiles-update-expire.sh
@@ -61,10 +61,6 @@ EXPIRY_TOUCHFROM=${EXPIRY_TOUCHFROM:="13"}
 EXPIRY_DELETEFROM=${EXPIRY_DELETEFROM:="19"}
 EXPIRY_MAXZOOM=${EXPIRY_MAXZOOM:="20"}
 
-
-REPLICATION_URL=${REPLICATION_URL:="https://planet.openstreetmap.org/replication/hour/"}
-MAX_INTERVAL_SECONDS=${MAX_INTERVAL_SECONDS:="3600"}
-
 #*************************************************************************
 #*************************************************************************
 

diff --git a/run.sh b/run.sh
@@ -81,7 +81,7 @@ if [ "$1" == "import" ]; then
         REPLICATION_TIMESTAMP=`osmium fileinfo -g header.option.osmosis_replication_timestamp /data/region.osm.pbf`
 
         # initial setup of osmosis workspace (for consecutive updates)
-        sudo -u renderer openstreetmap-tiles-update-expire.sh $REPLICATION_TIMESTAMP
+        sudo -E -u renderer openstreetmap-tiles-update-expire.sh $REPLICATION_TIMESTAMP
     fi
 
     # copy polygon file if available