[Git][debian-gis-team/libapache2-mod-tile][patch-queue/master] 3 commits: New upstream version 0.5
Felix Delattre
gitlab at salsa.debian.org
Mon Sep 28 09:55:19 BST 2020
Felix Delattre pushed to branch patch-queue/master at Debian GIS Project / libapache2-mod-tile
Commits:
2a5b7fd8 by Felix Delattre at 2020-09-28T08:11:21+00:00
New upstream version 0.5
- - - - -
dfd9cba0 by Boris Shtrasman at 2020-09-28T08:34:50+00:00
Support libiniparser package.
Gbp-Pq: Name iniparser.patch
- - - - -
9c2b2903 by Andy Townsend at 2020-09-28T08:35:52+00:00
Change to fetch minutely updates from https not http
- - - - -
6 changed files:
- configure.ac
- debian/tileserver_site.conf
- docs/render_list.1
- mod_tile.conf
- openstreetmap-tiles-update-expire
- src/daemon.c
Changes:
=====================================
configure.ac
=====================================
@@ -75,7 +75,7 @@ if test "$APXS" = "reject"; then
fi
AC_SEARCH_LIBS([iniparser_load], [iniparser], [
- AC_CHECK_HEADERS([iniparser.h], [have_system_iniparser=yes])
+ AC_CHECK_HEADERS([iniparser/iniparser.h], [have_system_iniparser=yes])
])
AM_CONDITIONAL([SYSTEM_LIBINIPARSER], [test "x$have_system_iniparser" = "xyes"])
if test "x$have_system_iniparser" = "xyes"; then
=====================================
debian/tileserver_site.conf
=====================================
@@ -33,6 +33,15 @@
# Alternatively (or in addition) you can load all the tile sets defined in the configuration file into this virtual host
LoadTileConfigFile /etc/renderd.conf
+# Specify if mod_tile should keep tile delivery stats, which can be accessed from the URL /mod_tile
+# The default is On. As keeping stats needs to take a lock, this might have some performance impact,
+# but for nearly all intents and purposes this should be negligable and so it is safe to keep this turned on.
+ ModTileEnableStats On
+
+# Turns on bulk mode. In bulk mode, mod_tile does not request any dirty tiles to be rerendered. Missing tiles
+# are always requested in the lowest priority. The default is Off.
+ ModTileBulkMode Off
+
# Timeout before giving up for a tile to be rendered
ModTileRequestTimeout 3
@@ -111,20 +120,24 @@ ModTileCacheDurationLowZoom 9 518400
ModTileCacheLastModifiedFactor 0.20
## Tile Throttling
-## Tile scrappers can often download large numbers of tiles and overly staining tileserver resources
+## Tile scrapers can often download large numbers of tiles and overly strain tileserver resources
## mod_tile therefore offers the ability to automatically throttle requests from ip addresses that have
## requested a lot of tiles.
## The mechanism uses a token bucket approach to shape traffic. I.e. there is an initial pool of n tiles
## per ip that can be requested arbitrarily fast. After that this pool gets filled up at a constant rate
-## The algorithm has to metrics. One based on overall tiles served to an ip address and a second one based on
+## The algorithm has two metrics. One based on overall tiles served to an ip address and a second one based on
## the number of requests to renderd / tirex to render a new tile.
## Overall enable or disable tile throttling
ModTileEnableTileThrottling Off
-## When the tileserver is behind a proxy one can use the X-Forwarded-For http header to determin the remote IP for throttling
-## 0: don't use X-Forwarded-For
-## 1: Use the first address in the X-Forwarded chain, which should be the client address. However, this may not be trusted.
-## 2: Use the last address in the X-Forwarded chain. If one uses a reverse proxy, this will be the IP address seen by the reverse proxy and can be trusted.
+# Specify if you want to use the connecting IP for throtteling, or use the X-Forwarded-For header to determin the
+# IP address to be used for tile throttling. This can be useful if you have a reverse proxy / http accellerator
+# in front of your tile server.
+# 0 - don't use X-Forward-For and allways use the IP that apache sees
+# 1 - use the client IP address, i.e. the first entry in the X-Forwarded-For list. This works through a cascade of proxies.
+# However, as the X-Forwarded-For is written by the client this is open to manipulation and can be used to circumvent the throttling
+# 2 - use the last specified IP in the X-Forwarded-For list. If you know all requests come through a reverse proxy
+# that adds an X-Forwarded-For header, you can trust this IP to be the IP the reverse proxy saw for the request
ModTileEnableTileThrottlingXForward 0
## Parameters (poolsize in tiles and topup rate in tiles per second) for throttling tile serving.
=====================================
docs/render_list.1
=====================================
@@ -7,13 +7,70 @@ render_list \- renders a list of map tiles by sending requests to a rendering da
.RI [ options ] < "render.list"
.br
.SH DESCRIPTION
-This manual page documents briefly the
+This manual page briefly documents the
.B render_list
command.
.PP
.B render_list
is a helper utility that takes a list of map tiles from stdin and sends the requests to a rendering daemon
.PP
+.SH OPTIONS
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+\fB\-a\fR|\-\-all
+Render all tiles in given zoom level range instead of reading from STDIN.
+.TP
+\fB\-f\fR|\-\-force
+Render tiles even if they seem current.
+.TP
+\fB\-m\fR|\-\-map=MAP
+Render tiles in this map (defaults to 'default').
+.TP
+\fB\-l\fR|\-\-max-load=LOAD
+Sleep if load is this high (defaults to 16).
+.TP
+\fB\-s\fR|\-\-socket=SOCKET
+Unix domain socket name for contacting renderd.
+.TP
+\fB\-n\fR|\-\-num-threads=N
+The number of parallel request threads (default 1).
+.TP
+\fB\-t\fR|\-\-tile-dir
+Tile cache directory (defaults to '/var/lib/mod_tile').
+.TP
+\fB\-z\fR|\-\-min-zoom=ZOOM
+Filter input to only render tiles greater or equal to this zoom level (default is 0).
+.TP
+\fB\-Z\fR|\-\-max-zoom=ZOOM
+Filter input to only render tiles less than or equal to this zoom level (default is 20).
+.PP
+If you are using --all, you can restrict the tile range by adding these options:
+.br
+ -x, --min-x=X minimum X tile coordinate
+.br
+ -X, --max-x=X maximum X tile coordinate
+.br
+ -y, --min-y=Y minimum Y tile coordinate
+.br
+ -Y, --max-y=Y maximum Y tile coordinate
+.PP
+Without --all, send a list of tiles to be rendered from STDIN in the format:
+.br
+ X Y Z
+.br
+e.g.
+.br
+ 0 0 1
+.br
+ 0 1 1
+.br
+ 1 0 1
+.br
+ 1 1 1
+.br
+The above would cause all 4 tiles at zoom 1 to be rendered
.SH SEE ALSO
.BR renderd (8),
.BR mod_tile (1).
=====================================
mod_tile.conf
=====================================
@@ -30,7 +30,7 @@ LoadModule tile_module modules/mod_tile.so
# Specify if mod_tile should keep tile delivery stats, which can be accessed from the URL /mod_tile
# The default is On. As keeping stats needs to take a lock, this might have some performance impact,
-# but for nearly all intents and purposes this should be negligable ans so it is safe to keep this turned on.
+# but for nearly all intents and purposes this should be negligable and so it is safe to keep this turned on.
ModTileEnableStats On
# Turns on bulk mode. In bulk mode, mod_tile does not request any dirty tiles to be rerendered. Missing tiles
@@ -122,7 +122,7 @@ ModTileCacheDurationLowZoom 9 518400
ModTileCacheLastModifiedFactor 0.20
## Tile Throttling
-## Tile scrapers can often download large numbers of tiles and overly straining tileserver resources
+## Tile scrapers can often download large numbers of tiles and overly strain tileserver resources
## mod_tile therefore offers the ability to automatically throttle requests from ip addresses that have
## requested a lot of tiles.
## The mechanism uses a token bucket approach to shape traffic. I.e. there is an initial pool of n tiles
=====================================
openstreetmap-tiles-update-expire
=====================================
@@ -75,7 +75,9 @@ if [ $# -eq 1 ] ; then
m_info "Initialising Osmosis replication system to $1"
mkdir $WORKOSM_DIR
$OSMOSIS_BIN --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2> "$OSMOSISLOG"
- wget "http://osm.personalwerk.de/replicate-sequences/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt
+ wget "https://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt
+ mv $WORKOSM_DIR/configuration.txt $WORKOSM_DIR/configuration_orig.txt
+ sed "s!baseUrl=http://planet.openstreetmap.org/replication/minute!baseUrl=https://planet.openstreetmap.org/replication/minute!" $WORKOSM_DIR/configuration_orig.txt > $WORKOSM_DIR/configuration.txt
else
# make sure the lockfile is removed when we exit and then claim it
@@ -120,4 +122,4 @@ else
-fi
\ No newline at end of file
+fi
=====================================
src/daemon.c
=====================================
@@ -29,7 +29,7 @@
#define PIDFILE "/run/renderd/renderd.pid"
#if SYSTEM_LIBINIPARSER
-#include <iniparser.h>
+#include <iniparser/iniparser.h>
#else
// extern "C" {
#include "iniparser3.0b/src/iniparser.h"
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/ac70371d8306c6deb8a1fa4f4911682df77fb8b4...9c2b2903ce0299d3b7c88e1107ae554816523b0a
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/ac70371d8306c6deb8a1fa4f4911682df77fb8b4...9c2b2903ce0299d3b7c88e1107ae554816523b0a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200928/7540edeb/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list