add osmdehd style

diff --git a/scripts/dailymaint.sh b/scripts/dailymaint.sh
index 64b7cf1ff673d9622d83b9400c129e2b1c23e6c3..9822a30bca6b8c10d8fbf7551eee607e7b7e3e5b 100755 (executable)
--- a/scripts/dailymaint.sh
+++ b/scripts/dailymaint.sh
@@ -5,10 +5,12 @@ echo "Daily maintenance starting: `date`"
 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
 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

+sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 13-14 --action delete --rmemptydirs --minage 336 /var/lib/tirex/tiles/osmdehd

 # 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 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

+sudo -u tirex -- /home.local/osm/bin/osmtilecleanup.pl --zoom 15-20 --action delete --rmemptydirs --minage 168 /var/lib/tirex/tiles/osmdehd

 # 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
 # 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


@@ -22,6 +24,8 @@ export PRIO=31
                                       --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
                                       --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

+/home.local/osm/bin/osmtilecleanup.pl --zoom  0-12 --action rerender \
+                                      --limit 2000 --rrs /home.local/osm/bin/osmrerenderwrapper-osmdehd.sh /var/lib/tirex/tiles/osmdehd

 # 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).
 # 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).


@@ -31,10 +35,13 @@ export PRIO=31
                                       --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
                                       --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

+/home.local/osm/bin/osmtilecleanup.pl --zoom  13-14 --action rerender \
+                                      --limit 1000 --rrs /home.local/osm/bin/osmrerenderwrapper-osmdehd.sh /var/lib/tirex/tiles/osmdehd

 # 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
 tirex-tiledir-check --stats=/var/lib/tirex/stats/tiles-osmhd.stats 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
 tirex-tiledir-check --stats=/var/lib/tirex/stats/tiles-osmhd.stats osmhd

+tirex-tiledir-check --stats=/var/lib/tirex/stats/tiles-osmdehd.stats osmdehd

 
 DOW=`/bin/date '+%w'`
 if [ "$DOW" == "6" -o "$DOW" == "3" ] ; then
 
 DOW=`/bin/date '+%w'`
 if [ "$DOW" == "6" -o "$DOW" == "3" ] ; then


@@ -47,6 +54,7 @@ fi
 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
 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

+tirex-batch --prio=${PRIO} --expire=+14400 map=osmdehd bbox=10.93,49.37,11.14,49.63 z=13-19

 
 echo "Daily maintenance finished: `date`"
 
 
 echo "Daily maintenance finished: `date`"