[Git][debian-gis-team/libapache2-mod-tile][master] 3 commits: added systemd.service

[Felix Delattre]

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


Commits:
24720515 by Felix Delattre at 2020-08-25T20:24:18+00:00
added systemd.service

- - - - -
2757a3eb by Felix Delattre at 2020-08-26T15:18:33+00:00
moved helper scripts to a suitable location

- - - - -
77d80483 by Felix Delattre at 2020-08-26T15:27:34+00:00
prepared libapache2-mod-tile to work equally with renderd and tirex

- - - - -


15 changed files:

- debian/control
- debian/copyright
- debian/libapache2-mod-tile.apache2
- − debian/libapache2-mod-tile.dirs
- + debian/libapache2-mod-tile.examples
- debian/libapache2-mod-tile.install
- − debian/libapache2-mod-tile.links
- debian/libapache2-mod-tile.postinst
- debian/libapache2-mod-tile.conf → debian/libapache2-renderd.conf
- + debian/renderd.apache2
- debian/renderd.conf
- + debian/renderd.dirs
- + debian/renderd.links
- debian/renderd.postinst
- + debian/renderd.service


Changes:

=====================================
debian/control
=====================================
@@ -1,7 +1,7 @@
 Source: libapache2-mod-tile
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Felix Delattre <debian at xama.nu>
-Section: science
+Section: web
 Priority: optional
 Build-Depends: debhelper (>= 10~),
                dh-apache2,
@@ -18,11 +18,12 @@ Homepage: https://wiki.openstreetmap.org/wiki/Mod_tile
 
 Package: libapache2-mod-tile
 Architecture: any
-Section: httpd
-Depends: libjs-openlayers,
-         renderd | tirex-master,
-         ${shlibs:Depends},
+Section: web
+Depends: ${shlibs:Depends},
          ${misc:Depends},
+         libjs-openlayers,
+         apache2,
+         renderd | tirex,
 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
@@ -46,9 +47,10 @@ Architecture: any
 Section: utils
 Depends: lsb-base,
          ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         libapache2-mod-tile,
+         libmapnik3.0,
 Recommends: osm2pgsql,
-            openstreetmap-carto | openstreetmap-mapnik-stylesheet-data | openstreetmap-mapnik-carto-stylesheet-data
 Suggests: libapache2-mod-tile
 Description: Daemon that renders map tiles using mapnik
  mod_tile is a system to serve raster tiles for example to use within a


=====================================
debian/copyright
=====================================
@@ -31,7 +31,9 @@ Copyright: 1990, 1993, The Regents of the University of California
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2016, Bas Couwenberg <sebastic at debian.org>
+Copyright: 
+      2020, Felix Delattre <debian at xama.nu>
+      2016-2020, Bas Couwenberg <sebastic at debian.org>
       2011-2014, Kai Krueger <kakrueger at gmail.com>
            2009, Frederik Ramm <frederik at remote.org>
 License: GPL-2+


=====================================
debian/libapache2-mod-tile.apache2
=====================================
@@ -1,3 +1,2 @@
 mod src/.libs/mod_tile.so
 mod debian/tile.load
-conf debian/libapache2-mod-tile.conf


=====================================
debian/libapache2-mod-tile.dirs deleted
=====================================
@@ -1,2 +0,0 @@
-usr/share/libapache2-mod-tile
-var/lib/mod_tile


=====================================
debian/libapache2-mod-tile.examples
=====================================
@@ -0,0 +1,2 @@
+openstreetmap-tiles-update-expire
+osmosis-db_replag


=====================================
debian/libapache2-mod-tile.install
=====================================
@@ -1,5 +1,3 @@
 debian/tile.load                  etc/apache2/mods-available
 slippymap.html                    usr/share/libapache2-mod-tile
 munin/mod_tile*                   usr/share/munin/plugins
-openstreetmap-tiles-update-expire usr/bin
-osmosis-db_replag                 usr/bin


=====================================
debian/libapache2-mod-tile.links deleted
=====================================
@@ -1 +0,0 @@
-usr/share/javascript/openlayers usr/share/libapache2-mod-tile/openlayers


=====================================
debian/libapache2-mod-tile.postinst
=====================================
@@ -3,9 +3,6 @@
 set -e
 
 if [ "$1" = configure ] ; then
-    if [ -e /var/lib/mod_tile ]; then
-        chown www-data:www-data /var/lib/mod_tile
-    fi
 
     # only enable on new installs, not on upgrades
     if [ -z "$2" ] ; then


=====================================
debian/libapache2-mod-tile.conf → debian/libapache2-renderd.conf
=====================================
@@ -1,6 +1,6 @@
-Alias /mod_tile /usr/share/libapache2-mod-tile
+Alias /mod_tile /var/lib/mod_tile
 
-<Directory /usr/share/libapache2-mod-tile>
+<Directory  /var/lib/mod_tile>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
 


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


=====================================
debian/renderd.conf
=====================================
@@ -2,7 +2,7 @@
 stats_file=/var/run/renderd/renderd.stats
 socketname=/var/run/renderd/renderd.sock
 num_threads=4
-tile_dir=/var/lib/mod_tile
+tile_dir=/var/lib/renderd
 
 [mapnik]
 plugins_dir=/usr/lib/mapnik/3.0/input


=====================================
debian/renderd.dirs
=====================================
@@ -0,0 +1 @@
+var/lib/renderd/tiles


=====================================
debian/renderd.links
=====================================
@@ -0,0 +1 @@
+var/lib/renderd/tiles var/lib/mod_tile


=====================================
debian/renderd.postinst
=====================================
@@ -1,8 +1,7 @@
 #!/bin/sh
 set -e
 
-mkdir -p /var/lib/mod_tile
-chown www-data:www-data /var/lib/mod_tile
+chown www-data:www-data -R /var/lib/mod_tile
 
 # automatically install munin plugins if munin is present.
 if [ -d /etc/munin/plugins ]


=====================================
debian/renderd.service
=====================================
@@ -0,0 +1,10 @@
+[Unit]
+Description=Renderd
+After=network.target auditd.service
+
+[Service]
+ExecStart=/usr/bin/renderd -f
+User=www-data
+
+[Install]
+WantedBy=multi-user.target



View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/3b40acaaa145f944b0597938bd39521f532b102c...77d80483e3391bede3542fd403f99f8dc622f3d6

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/3b40acaaa145f944b0597938bd39521f532b102c...77d80483e3391bede3542fd403f99f8dc622f3d6
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/20200826/1aed75e9/attachment-0001.html>