make it possible to enable or disable rerenderings by a file.

diff --git a/scripts/doosmupdate.sh b/scripts/doosmupdate.sh
index 3a8fc11ed9d4a45cf7c696066caa08add34d5282..eadb5c894ebc1ae0f4be0e5389ac5108cbbe7962 100755 (executable)
--- a/scripts/doosmupdate.sh
+++ b/scripts/doosmupdate.sh
@@ -3,6 +3,7 @@
 LOCKFILE=/home.local/osm/run/.osmupdate.lock
 CHANGESFILE=/home.local/osm/run/osmosis-changes.osc.gz
 EXPIRYFILE=/home.local/osm/run/expiredtiles.lst
+RERENDEREXPIREDTRIGGERFILE=/home.local/osm/run/rerenderexpiredtiles.setting
 OSMOSISWORKDIR=/home.local/osm/.osmosis
 WEBSTATEFILE=/var/www/lastdbupdate.txt
 # Note: set the expire-tiles to 3 less than the real maximum,
@@ -69,10 +70,11 @@ grep timestamp $OSMOSISWORKDIR/state.txt | sed -e 's/timestamp=//g' -e 's/T/ /g'
 echo -n "Updated database: now at upstream state of "
 cat $WEBSTATEFILE
 #touch /var/lib/tirex/tiles/planet-import-complete
-if [ -e $EXPIRYFILE ] ; then
+if [ -e $EXPIRYFILE -a -e $RERENDEREXPIREDTRIGGERFILE ] ; then
        echo "Expiryfile exists. Telling tirex to rerender the tiles mentioned there..."
        echo "Number of lines: `wc -l $EXPIRYFILE`"
        # Used to be zoom 13-20 but that causes too much load. Reduced to 15-20.
+       # Trying completely without. Lots of load, way too many false positives. -unrz191 2015-09-04
        cat $EXPIRYFILE | /home.local/osm/bin/osmtilecleanup.pl \
                                    --action rerenderexpiredlist --zoom 15-20 \
                                    --rrs /home.local/osm/bin/osmrerenderwrapper.sh \