X-Git-Url: http://git.rrze.uni-erlangen.de/gitweb/?p=osmrrze.git;a=blobdiff_plain;f=scripts%2Fdailymaint.sh;h=dbe2a41ad937e8ca987c166e0dc50da42b064923;hp=f321130e60111fb46a48908e219e9c6dda2ff04f;hb=1ef97ffe70261c8edae52bfaaf009d43e6472fab;hpb=5203e8e5f81d512c3365deef8cfb4df359e1ce8e

diff --git a/scripts/dailymaint.sh b/scripts/dailymaint.sh
index f321130..dbe2a41 100755
--- a/scripts/dailymaint.sh
+++ b/scripts/dailymaint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 echo "Daily maintenance starting: `date`"
 # Delete tiles in zoomlevel 13-14 that are older than 336 hours = 14 days
@@ -7,12 +7,23 @@ sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 13-14 --action del
 # Delete tiles in zoomlevel 15-20 that are older than 168 hours =  7 days
 sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 15-20 --action delete --rmemptydirs --minage 168 /var/lib/tirex/tiles/osm
 sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 15-20 --action delete --rmemptydirs --minage 168 /var/lib/tirex/tiles/osmde
+# Delete all tiles in our bicycle/lecture hall overlay that are older
+# than 24 hours as these are REALLY cheap to regenerate on the fly.
+sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 10-20 --action delete --rmemptydirs --minage 24 /var/lib/tirex/tiles/rrze-ovl
 # Regenerate a part of zoomlevel 0-12 tiles. There are at most 350000 such tiles.
 # At 5000 a day, it'll take 70 days to regenerate all. As they hardly ever change, that should be fine.
+export PRIO=31
 /home.local/osm/bin/osmtilecleanup.pl --zoom  0-12 --action rerender \
                                       --limit 5000 --rrs /home.local/osm/bin/osmrerenderwrapper.sh /var/lib/tirex/tiles/osm
 /home.local/osm/bin/osmtilecleanup.pl --zoom  0-12 --action rerender \
                                       --limit 5000 --rrs /home.local/osm/bin/osmrerenderwrapper-osmde.sh /var/lib/tirex/tiles/osmde
+# Regenerate (part of) zoomlevel 13-14 tiles. Some of these are pretty expensive, so
+# we rather rerender them scheduled than when they change (usually they really don't,
+# it is 99 percent false alerts).
+/home.local/osm/bin/osmtilecleanup.pl --zoom  13-14 --action rerender \
+                                      --limit 1000 --rrs /home.local/osm/bin/osmrerenderwrapper.sh /var/lib/tirex/tiles/osm
+/home.local/osm/bin/osmtilecleanup.pl --zoom  13-14 --action rerender \
+                                      --limit 1000 --rrs /home.local/osm/bin/osmrerenderwrapper-osmde.sh /var/lib/tirex/tiles/osmde
 # Update tile stats for munin
 tirex-tiledir-check --stats=/var/lib/tirex/stats/tiles-osm.stats osm
 tirex-tiledir-check --stats=/var/lib/tirex/stats/tiles-osmde.stats osmde
@@ -25,8 +36,8 @@ if [ "$DOW" == "6" -o "$DOW" == "3" ] ; then
 fi
 
 # Rerender Erlangen / Nuernberg. Around 4000 tiles, takes around 30 minutes.
-tirex-batch --prio=22 --expire=+14400 map=osm bbox=10.93,49.37,11.14,49.63 z=13-19
-tirex-batch --prio=22 --expire=+14400 map=osmde bbox=10.93,49.37,11.14,49.63 z=13-19
+tirex-batch --prio=${PRIO} --expire=+14400 map=osm bbox=10.93,49.37,11.14,49.63 z=13-19
+tirex-batch --prio=${PRIO} --expire=+14400 map=osmde bbox=10.93,49.37,11.14,49.63 z=13-19
 
 echo "Daily maintenance finished: `date`"