From: User for running Openstreetmap-things <osm@osm.rrze.uni-erlangen.de>
Date: Thu, 4 Feb 2016 13:47:08 +0000 (+0100)
Subject: make it possible to enable or disable rerenderings by a file.
X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?p=osmrrze.git;a=commitdiff_plain;h=002b918b0df1e88b3b703d9d504e84fe3515d50c

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

diff --git a/scripts/doosmupdate.sh b/scripts/doosmupdate.sh
index 3a8fc11..eadb5c8 100755
--- 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 \