Merge branch 'master' of git.rrze.uni-erlangen.de:osmrrze

diff --git a/scripts/dailymaint.sh b/scripts/dailymaint.sh
index e3da2b72a90cee3af7c75ee6df401d9c6a1cd78f..64b7cf1ff673d9622d83b9400c129e2b1c23e6c3 100755 (executable)
--- a/scripts/dailymaint.sh
+++ b/scripts/dailymaint.sh
@@ -4,9 +4,11 @@ echo "Daily maintenance starting: `date`"
 # Delete tiles in zoomlevel 13-14 that are older than 336 hours = 14 days
 sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 13-14 --action delete --rmemptydirs --minage 336 /var/lib/tirex/tiles/osm
 sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 13-14 --action delete --rmemptydirs --minage 336 /var/lib/tirex/tiles/osmde
+sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 13-14 --action delete --rmemptydirs --minage 336 /var/lib/tirex/tiles/osmhd
 # 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
+sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 15-20 --action delete --rmemptydirs --minage 168 /var/lib/tirex/tiles/osmhd
 # 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
@@ -18,6 +20,8 @@ export PRIO=31
                                       --limit 2000 --rrs /home.local/osm/bin/osmrerenderwrapper.sh /var/lib/tirex/tiles/osm
 /home.local/osm/bin/osmtilecleanup.pl --zoom  0-12 --action rerender \
                                       --limit 2000 --rrs /home.local/osm/bin/osmrerenderwrapper-osmde.sh /var/lib/tirex/tiles/osmde
+/home.local/osm/bin/osmtilecleanup.pl --zoom  0-12 --action rerender \
+                                      --limit 2000 --rrs /home.local/osm/bin/osmrerenderwrapper-osmhd.sh /var/lib/tirex/tiles/osmhd
 # 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).
@@ -25,6 +29,8 @@ export PRIO=31
                                       --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
+/home.local/osm/bin/osmtilecleanup.pl --zoom  13-14 --action rerender \
+                                      --limit 1000 --rrs /home.local/osm/bin/osmrerenderwrapper-osmhd.sh /var/lib/tirex/tiles/osmhd
 # 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
@@ -40,6 +46,7 @@ fi
 # Rerender Erlangen / Nuernberg. Around 4000 tiles, takes around 30 minutes.
 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
+tirex-batch --prio=${PRIO} --expire=+14400 map=osmhd bbox=10.93,49.37,11.14,49.63 z=13-19
 
 echo "Daily maintenance finished: `date`"
 

diff --git a/scripts/doosmupdate.sh b/scripts/doosmupdate.sh
index 3ebe00b355c132e22f62e91aa14b527714591c13..e7a447f2db9cc72bc39df952dee5073aa2201ef9 100755 (executable)
--- a/scripts/doosmupdate.sh
+++ b/scripts/doosmupdate.sh
@@ -76,15 +76,15 @@ if [ -e $EXPIRYFILE ] ; then
                echo "Expiryfile and triggerfile  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 \
+               cat $EXPIRYFILE | sudo -u tirex /home.local/osm/bin/osmtilecleanup.pl \
+                                   --action touchexpiredlist --zoom 15-20 \
                                    /var/lib/tirex/tiles/osm
-               cat $EXPIRYFILE | /home.local/osm/bin/osmtilecleanup.pl \
-                                   --action rerenderexpiredlist --zoom 15-20 \
-                                   --rrs /home.local/osm/bin/osmrerenderwrapper-osmde.sh \
+               cat $EXPIRYFILE | sudo -u tirex /home.local/osm/bin/osmtilecleanup.pl \
+                                   --action touchexpiredlist --zoom 15-20 \
                                    /var/lib/tirex/tiles/osmde
+               cat $EXPIRYFILE | sudo -u tirex /home.local/osm/bin/osmtilecleanup.pl \
+                                   --action touchexpiredlist --zoom 15-20 \
+                                   /var/lib/tirex/tiles/osmhd
        else
                echo "Expiryfile exists but rerendering is disabled."
        fi