[Git][debian-gis-team/tirex][master] 5 commits: Remove packaging for example map.
ǝɹʇʇɐʃǝ◖ xıʃǝɟ (@xamanu)
gitlab at salsa.debian.org
Tue Aug 17 18:18:02 BST 2021
ǝɹʇʇɐʃǝ◖ xıʃǝɟ pushed to branch master at Debian GIS Project / tirex
Commits:
87440f4f by Felix Delattre at 2021-08-17T16:49:35+00:00
Remove packaging for example map.
- - - - -
5b90fbab by Felix Delattre at 2021-08-17T17:01:36+00:00
Update copyright information.
- - - - -
b9bf5b0b by Felix Delattre at 2021-08-17T17:08:21+00:00
Place apache2 config when installing tirex.
- - - - -
ab0aa53d by Felix Delattre at 2021-08-17T17:13:09+00:00
Introduced dedicated user _tirex.
- - - - -
2e186ca9 by Felix Delattre at 2021-08-17T17:17:08+00:00
Update changelog.
- - - - -
12 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/etc/apache2/tirex.conf
- debian/rules
- debian/tirex-backend-manager.service
- − debian/tirex-example-map.install
- − debian/tirex-example-map.postinst
- debian/tirex-master.service
- + debian/tirex.apache2
- debian/tirex.postinst
- + debian/tirex.postrm
Changes:
=====================================
debian/changelog
=====================================
@@ -1,14 +1,21 @@
-tirex (0.6.3-1) UNRELEASED; urgency=medium
+tirex (0.6.4-1_exp1) UNRELEASED; urgency=medium
[ Felix Delattre ]
- * targeted packaging to debian archive
+ * Targeted packaging to debian archive
+ * Adjusted copyright information.
+ * Use tirex instead of tirex-core.
+ * Sort dependencies, specific dependencies first.
+ * Reviewed section declaration of packages.
+ * Remove packaging for example map.
+ * Place apache2 config when installing tirex.
+ * Introduced dedicated user _tirex.
[ Bas Couwenberg ]
* Bump watch file version to 4.
* Bump Standards-Version to 4.5.1, no changes.
* Update watch file for GitHub URL changes.
- -- Felix Delattre <debian at xama.nu> Mon, 17 Aug 2020 00:00:00 +0000
+ -- Felix Delattre <debian at xama.nu> Tue, 17 Aug 2021 17:13:23 +0000
tirex (0.6.3) bionic; urgency=medium
=====================================
debian/control
=====================================
@@ -4,6 +4,7 @@ Uploaders: Felix Delattre <debian at xama.nu>
Section: science
Priority: optional
Build-Depends: debhelper (>= 10~),
+ dh-apache2,
libboost-program-options-dev,
libmapnik-dev,
Standards-Version: 4.5.1
@@ -23,7 +24,7 @@ Depends: adduser,
${shlibs:Depends},
${misc:Depends},
Suggests: tirex-backend-mapnik,
-Description: Tirex raster tile rendering system
+Description: Daemon that renders raster map tile using different backends
The Tirex suite of programs manages map raster tile rendering and caching.
This package contains the master daemon, rendering manager, test backend,
and assorted utility programs.
@@ -62,9 +63,9 @@ Depends: tirex,
libhttp-async-perl,
${shlibs:Depends},
${misc:Depends},
-Description: WMS backend for the Tirex tile rendering system
+Description: TMS backend for the Tirex tile rendering system
The Tirex suite of programs manages map tile rendering and caching.
- This is the WMS backend for fetching maps from a WMS server.
+ This is the TMS backend for fetching maps from a TMS server.
Package: tirex-syncd
Section: utils
@@ -78,16 +79,3 @@ Description: Tirex sync daemon
and then copies the metatile to another server. The sync daemon is intended
to be used in setups where you have multiple tile servers with their own
rendering queues.
-
-Package: tirex-example-map
-Section: web
-Architecture: any
-Depends: libjs-leaflet,
- tirex,
- tirex-backend-mapnik,
- ${shlibs:Depends},
- ${misc:Depends},
-Description: Tirex example map data and configuration
- The Tirex suite of programs manages map tile rendering and caching.
- This package includes example map data and an example config for the Mapnik
- renderer.
=====================================
debian/copyright
=====================================
@@ -1,16 +1,16 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
-Source: https://github.com/openstreetmap/tirex
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Tirex
Upstream-Contact: Frederik Ramm <frederik.ramm at geofabrik.de>
+Source: https://github.com/openstreetmap/tirex
Files: *
-Copyright: (c) 2010..2020 Frederik Ramm <frederik.ramm at geofabrik.de>
- Jochen Topf <jochen.topf at geofabrik.de>
+Copyright: 2010-2021, Frederik Ramm <frederik.ramm at geofabrik.de>
+ 2010-2021, Jochen Topf <jochen.topf at geofabrik.de>
License: GPL-2+
Files: debian/*
-Copyright: 2010..2020 Frederik Ramm <frederik.ramm at geofabrik.de>
- Felix Delattre <felix at delattre.de>
+Copyright: 2010-2020, Frederik Ramm <frederik.ramm at geofabrik.de>
+ 2020-2021, Felix Delattre <debian at xama.nu>
License: GPL-2+
License: GPL-2+
=====================================
debian/etc/apache2/tirex.conf
=====================================
@@ -0,0 +1,23 @@
+Alias /mod_tile /var/cache/tirex/tiles
+
+<Directory /var/cache/tirex/tiles>
+
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+
+ ModTiletirexSocketName /var/run/tirex/tirex.sock
+ ModTileTileDir /var/cache/tirex/tiles
+ ModTileRequestTimeout 0
+ ModTileMissingRequestTimeout 60
+ <Location "/mod_tile">
+ # This is used by munin graphs.
+ # Only allow local connections
+ Require local
+ </Location>
+ # Block internal commands
+ RedirectMatch 404 /tiles/.*/dirty
+ RedirectMatch 404 /tiles/.*/status
+ AddTileConfig /etc/tirex.conf
+
+</Directory>
=====================================
debian/rules
=====================================
@@ -6,7 +6,7 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
- dh $@
+ dh $@ --with apache2
override_dh_auto_test:
dh_auto_test || echo "Ignoring test failures"
=====================================
debian/tirex-backend-manager.service
=====================================
@@ -8,8 +8,8 @@ ExecStart=/usr/bin/tirex-backend-manager -f
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=on-failure
-User=tirex
-Group=tirex
+User=_tirex
+Group=_tirex
RuntimeDirectory=tirex
[Install]
=====================================
debian/tirex-example-map.install deleted
=====================================
@@ -1,2 +0,0 @@
-etc/tirex/renderer/mapnik/example.conf
-usr/share/tirex/example-map
=====================================
debian/tirex-example-map.postinst deleted
=====================================
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-set -e
-
-[ -d /var/lib/tirex/tiles/example ] || mkdir -p /var/lib/tirex/tiles/example && chown tirex:tirex /var/lib/tirex/tiles/example
-
-#DEBHELPER#
=====================================
debian/tirex-master.service
=====================================
@@ -8,8 +8,8 @@ ExecStart=/usr/bin/tirex-master -f
ExecReload=/bin/kill -HUP $MAINPID
KillMode=process
Restart=on-failure
-User=tirex
-Group=tirex
+User=_tirex
+Group=_tirex
RuntimeDirectory=tirex
[Install]
=====================================
debian/tirex.apache2
=====================================
@@ -0,0 +1 @@
+conf debian/etc/apache2/tirex.conf
=====================================
debian/tirex.postinst
=====================================
@@ -2,17 +2,33 @@
set -e
-if ! getent passwd tirex >/dev/null; then
- adduser --group --system --no-create-home --shell /bin/bash --home /var/lib/tirex tirex
-fi
+case "$1" in
+ configure)
+ if ! getent group _tirex > /dev/null; then
+ addgroup --force-badname --quiet --system _tirex
+ fi
+
+ if ! getent passwd _tirex > /dev/null; then
+ adduser --force-badname --gecos "tirex daemon" \
+ --home /nonexistent --ingroup _tirex \
+ --no-create-home --quiet --system _tirex
+ fi
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
for dir in /var/run/tirex /var/log/tirex /var/lib/tirex /var/lib/tirex/stats /var/lib/tirex/tiles /var/lib/tirex/tiles/test; do
- [ -d $dir ] || mkdir -p $dir && chown tirex:tirex $dir
+ [ -d $dir ] || mkdir -p $dir && chown _tirex:_tirex $dir
done
dpkg-statoverride --list /var/log/tirex >/dev/null || \
- dpkg-statoverride --update --add tirex adm 0750 /var/log/tirex
+ dpkg-statoverride --update --add _tirex adm 0750 /var/log/tirex
dpkg-statoverride --list /var/run/tirex >/dev/null || \
- dpkg-statoverride --update --add tirex root 0755 /var/run/tirex
+ dpkg-statoverride --update --add _tirex root 0755 /var/run/tirex
#DEBHELPER#
=====================================
debian/tirex.postrm
=====================================
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ] ; then
+ deluser --quiet --system _tirex > /dev/null || true
+ delgroup --quiet --system _tirex > /dev/null || true
+fi
View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/00e4f66ba1fa33630dca36a7e65a487c0d13a23e...2e186ca93b37ba0a638b8fe54038d734de54690b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/compare/00e4f66ba1fa33630dca36a7e65a487c0d13a23e...2e186ca93b37ba0a638b8fe54038d734de54690b
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/20210817/af61cc6e/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list