Compare commits
1 Commits
3e9efab750
...
e29e2d32ce
Author | SHA1 | Date |
---|---|---|
Vitaliy Filippov | e29e2d32ce |
|
@ -53,6 +53,7 @@ podman run \
|
||||||
-v /run/postgresql:/run/postgresql \
|
-v /run/postgresql:/run/postgresql \
|
||||||
-v /home/osm/download:/data \
|
-v /home/osm/download:/data \
|
||||||
-v /home/osm/mod_tile:/var/lib/mod_tile \
|
-v /home/osm/mod_tile:/var/lib/mod_tile \
|
||||||
|
-v /home/osm/logs:/var/log/tiles \
|
||||||
-v /dev/log:/dev/log \
|
-v /dev/log:/dev/log \
|
||||||
-p 8080:80 \
|
-p 8080:80 \
|
||||||
osm \
|
osm \
|
||||||
|
|
|
@ -188,11 +188,13 @@ fi
|
||||||
# delete >= $EXPIRY_DELETEFROM and <= $EXPIRY_MAXZOOM.
|
# delete >= $EXPIRY_DELETEFROM and <= $EXPIRY_MAXZOOM.
|
||||||
# The default path to renderd.sock is fixed.
|
# 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"
|
m_info "Expiry failed"
|
||||||
fi
|
else
|
||||||
|
|
||||||
rm "$EXPIRY_FILE.$$"
|
rm "$EXPIRY_FILE.$$"
|
||||||
|
fi
|
||||||
|
|
||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# Only remove the lock file after expiry (if system is slow we want to delay
|
# Only remove the lock file after expiry (if system is slow we want to delay
|
||||||
|
@ -201,8 +203,4 @@ fi
|
||||||
freelock "$LOCK_FILE"
|
freelock "$LOCK_FILE"
|
||||||
|
|
||||||
m_ok "Done with import"
|
m_ok "Done with import"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
2
run.sh
2
run.sh
|
@ -84,6 +84,8 @@ if [ "$1" = "run" ]; then
|
||||||
echo "PGDB='$PGDB'" >> /home/renderer/env
|
echo "PGDB='$PGDB'" >> /home/renderer/env
|
||||||
echo "PGPASSWORD='$PGPASSWORD'" >> /home/renderer/env
|
echo "PGPASSWORD='$PGPASSWORD'" >> /home/renderer/env
|
||||||
|
|
||||||
|
chown renderer /var/log/tiles
|
||||||
|
|
||||||
cd /home/renderer/src/openstreetmap-carto
|
cd /home/renderer/src/openstreetmap-carto
|
||||||
sed "s/ dbname: \"gis\"/ host: \"$PGHOST\"\n\
|
sed "s/ dbname: \"gis\"/ host: \"$PGHOST\"\n\
|
||||||
port: \"${PGPORT:-5432}\"\n\
|
port: \"${PGPORT:-5432}\"\n\
|
||||||
|
|
Loading…
Reference in New Issue