Fix updates: Add env var support to tiles-update-expire, remove pam_loginuid, install db_replag

README.md

@@ -53,6 +53,7 @@ podman run \
     -v /run/postgresql:/run/postgresql \
     -v /home/osm/download:/data \
     -v /home/osm/mod_tile:/var/lib/mod_tile \
+    -v /home/osm/logs:/var/log/tiles \
     -v /dev/log:/dev/log \
     -p 8080:80 \
     osm \

openstreetmap-tiles-update-expire

@@ -188,21 +188,19 @@ fi
 # delete >= $EXPIRY_DELETEFROM and <= $EXPIRY_MAXZOOM.
 # The default path to renderd.sock is fixed.
 #------------------------------------------------------------------------------
-    if ! render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM -s /var/run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
+    if ! render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM \
+        --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM -t /var/lib/mod_tile \
+        -s /var/run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
         m_info "Expiry failed"
+    else
+        rm "$EXPIRY_FILE.$$"
     fi
 
-    rm "$EXPIRY_FILE.$$"
-
 #------------------------------------------------------------------------------
 # Only remove the lock file after expiry (if system is slow we want to delay
 # the next import, not have multiple render_expired processes running)
 #------------------------------------------------------------------------------
-   freelock "$LOCK_FILE"
+    freelock "$LOCK_FILE"
 
     m_ok "Done with import"
-
-
-
-
 fi

run.sh

@@ -84,6 +84,8 @@ if [ "$1" = "run" ]; then
     echo "PGDB='$PGDB'" >> /home/renderer/env
     echo "PGPASSWORD='$PGPASSWORD'" >> /home/renderer/env
 
+    chown renderer /var/log/tiles
+
     cd /home/renderer/src/openstreetmap-carto
     sed "s/    dbname: \"gis\"/    host: \"$PGHOST\"\n\
     port: \"${PGPORT:-5432}\"\n\