[Git][debian-gis-team/libapache2-mod-tile][master] 3 commits: Cleaned up configuration files.

[Felix Delattre]

Felix Delattre pushed to branch master at Debian GIS Project / libapache2-mod-tile


Commits:
dea7df55 by Felix Delattre at 2020-08-31T18:39:25+00:00
Cleaned up configuration files.

- - - - -
3c0a4115 by Felix Delattre at 2020-08-31T18:43:48+00:00
Cleaned up slippymap.

- - - - -
13711f57 by Felix Delattre at 2020-08-31T18:45:53+00:00
Renamed renderd config file for apache2.

- - - - -


5 changed files:

- debian/control
- debian/libapache2-mod-tile.install
- debian/renderd.apache2
- debian/renderd.conf
- debian/libapache2-renderd.conf → debian/tileserver-renderd.conf


Changes:

=====================================
debian/control
=====================================
@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 10~),
                libcairo2-dev,
                libcurl4-gnutls-dev | libcurl-ssl-dev,
                libiniparser-dev,
-               libjs-openlayers,
                libmapnik-dev | libmapnik2-dev
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile
@@ -19,12 +18,9 @@ Homepage: https://wiki.openstreetmap.org/wiki/Mod_tile
 Package: libapache2-mod-tile
 Architecture: any
 Section: web
-Depends: apache2,
-         libjs-openlayers,
-         renderd | tirex,
+Depends: renderd | tirex,
          ${shlibs:Depends},
          ${misc:Depends}
-Recommends: ${misc:Recommends}
 Description: Apache module to deliver tiles created by renderd
  mod_tile is a system to serve raster tiles for example to use within a
  slippy map. It provides a dynamic combination of efficient caching and


=====================================
debian/libapache2-mod-tile.install
=====================================
@@ -1,3 +1,2 @@
 debian/tile.load                  etc/apache2/mods-available
-slippymap.html                    usr/share/libapache2-mod-tile
 munin/mod_tile*                   usr/share/munin/plugins


=====================================
debian/renderd.apache2
=====================================
@@ -1 +1 @@
-conf debian/libapache2-renderd.conf
+conf debian/tileserver-renderd.conf


=====================================
debian/renderd.conf
=====================================
@@ -6,17 +6,5 @@ tile_dir=/var/cache/renderd/tiles
 
 [mapnik]
 plugins_dir=/usr/lib/mapnik/3.0/input
-font_dir=/usr/share/fonts/truetype/ttf-dejavu
-font_dir_recurse=false
-
-[default]
-URI=/osm/
-XML=/etc/mapnik-osm-data/osm.xml
-DESCRIPTION=This is the standard osm mapnik style
-;ATTRIBUTION=©<a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and <a href=\"http://wiki.openstreetmap.org/w\
-iki/Contributors\">contributors</a>, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>
-;HOST=tile.openstreetmap.org
-;SERVER_ALIAS=http://a.tile.openstreetmap.org
-;SERVER_ALIAS=http://b.tile.openstreetmap.org
-;HTCPHOST=proxy.openstreetmap.org
-
+font_dir=/usr/share/fonts/truetype
+font_dir_recurse=true


=====================================
debian/libapache2-renderd.conf → debian/tileserver-renderd.conf
=====================================
@@ -1,9 +1,13 @@
-<Directory  /var/cache/renderd/tiles>
+Alias /mod_tile /var/cache/renderd/tiles
+
+<Directory /var/cache/renderd/tiles>
+
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
-
     Require all granted
 
+    ModTileTileDir /var/cache/renderd/tiles
+
     # You can manually configure each tile set with AddTileConfig or AddTileMimeConfig.
     # The first argument is the URL path relative to this virtual host
     # under which a tile set is served. The second argument specifies the
@@ -17,7 +21,7 @@
     # will guess the correct mimetype from it. If the mime type is not set correctly automatically,
     # you need to use the configuration file route, where you can specify the mimetype and file extension
     # independently.
-    # 
+    #
     #AddTileConfig /folder/ TileSetName
     #AddTileMimeConfig /folder2/ TileSetName2 js
 
@@ -106,7 +110,7 @@
     # 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 number of requests to renderd / tirex to render a new tile. 
+    # the number of requests to renderd / tirex to render a new tile.
 
     # Overall enable or disable tile throttling
     ModTileEnableTileThrottling Off
@@ -116,9 +120,9 @@
     # 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.
     ModTileEnableTileThrottlingXForward 0
 
-    # Parameters (poolsize in tiles and topup rate in tiles per second) for throttling tile serving. 
-    ModTileThrottlingTiles 10000 1 
-    # Parameters (poolsize in tiles and topup rate in tiles per second) for throttling render requests. 
+    # Parameters (poolsize in tiles and topup rate in tiles per second) for throttling tile serving.
+    ModTileThrottlingTiles 10000 1
+    # Parameters (poolsize in tiles and topup rate in tiles per second) for throttling render requests.
     ModTileThrottlingRenders 128 0.2
 
 </Directory>



View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/6520ccade03336f824e9e87764d70bf0ff621a66...13711f57bd44f16a3efb2ad4b235a26fa29de84f

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/6520ccade03336f824e9e87764d70bf0ff621a66...13711f57bd44f16a3efb2ad4b235a26fa29de84f
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/20200831/683aaed9/attachment-0001.html>