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

Vitaliy Filippov 2021-09-06 10:56:29 +03:00
parent 4ad4a77041
commit c486b2ef02
2 changed files with 7 additions and 4 deletions

View File

@ -155,6 +155,10 @@ RUN cd /home/renderer/src/openstreetmap-carto && patch -p1 < external-data.yml.d
COPY ./style.diff /home/renderer/src/openstreetmap-carto
RUN cd /home/renderer/src/openstreetmap-carto && patch -p1 < style.diff
RUN grep -v pam_loginuid /etc/pam.d/cron > /etc/pam.d/cron.new && mv /etc/pam.d/cron.new /etc/pam.d/cron && \
sed 's!/var/cache/renderd/tiles!$1!' /home/renderer/src/mod_tile/utils/osmosis-db_replag > /usr/bin/osmosis-db_replag && \
chmod 755 /usr/bin/osmosis-db_replag
# Start running
COPY run.sh /
ENTRYPOINT ["/run.sh"]

View File

@ -21,8 +21,7 @@ OSMOSIS_BIN=osmosis
OSM2PGSQL_BIN=osm2pgsql
TRIM_BIN=/home/$ACCOUNT/src/regional/trim_osc.py
DBNAME=gis
OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style ${OSM2PGSQL_EXTRA_ARGS}"
OSM2PGSQL_OPTIONS="-H '$PGHOST' -P '${PGPORT:-5432}' -U '$PGUSER' -d '$PGDB' -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style ${OSM2PGSQL_EXTRA_ARGS}"
#------------------------------------------------------------------------------
# When using trim_osc.py we can define either a bounding box (such as this
@ -31,7 +30,7 @@ OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore --tag-transform-script /home/renderer/
# This area will usually correspond to the data originally loaded.
#------------------------------------------------------------------------------
TRIM_POLY_FILE="/var/lib/mod_tile/data.poly"
TRIM_OPTIONS="-d $DBNAME"
TRIM_OPTIONS="-d '$PGDB' --host '$PGHOST' --port '${PGPORT:-5432}' --user '$PGUSER'"
#TRIM_REGION_OPTIONS="-b -14.17 48.85 2.12 61.27"
TRIM_REGION_OPTIONS="-p $TRIM_POLY_FILE"
@ -139,7 +138,7 @@ fi
seq=`cat $WORKOSM_DIR/state.txt | grep sequenceNumber | cut -d= -f2`
m_ok "start import from seq-nr $seq, replag is `osmosis-db_replag -h`"
m_ok "start import from seq-nr $seq, replag is `osmosis-db_replag /var/lib/mod_tile`"
/bin/cp $WORKOSM_DIR/state.txt $WORKOSM_DIR/last.state.txt
m_ok "downloading diff"