[Git][debian-gis-team/tirex][master] Adhere to FHS 3.0 and use daemon under /run.
ǝɹʇʇɐʃǝ◖ xıʃǝɟ (@xamanu)
gitlab at salsa.debian.org
Fri Aug 20 11:59:20 BST 2021
ǝɹʇʇɐʃǝ◖ xıʃǝɟ pushed to branch master at Debian GIS Project / tirex
Commits:
16ce5ac9 by Felix Delattre at 2021-08-20T10:58:54+00:00
Adhere to FHS 3.0 and use daemon under /run.
- - - - -
10 changed files:
- debian/control
- debian/etc/apache2/tirex.conf
- debian/etc/tirex/tirex.conf
- debian/tirex.install
- debian/tirex.postinst
- debian/tirex.tirex-backend-manager.init
- debian/tirex.tirex-backend-manager.simple-init
- debian/tirex.tirex-master.init
- debian/tirex.tirex-master.simple-init
- + debian/tmpfiles.d/tirex.conf
Changes:
=====================================
debian/control
=====================================
@@ -22,6 +22,7 @@ Depends: adduser,
libipc-sharelite-perl,
${misc:Depends},
${perl:Depends},
+ ${shlibs:Depends},
Recommends: tirex-backend-mapnik,
${misc:Recommends}
Description: Daemon that renders raster map tile using different backends
=====================================
debian/etc/apache2/tirex.conf
=====================================
@@ -6,7 +6,7 @@ Alias /mod_tile /var/cache/tirex/tiles
AllowOverride None
Require all granted
- ModTiletirexSocketName /var/run/tirex/tirex.sock
+ ModTiletirexSocketName /run/tirex/tirex.sock
ModTileTileDir /var/cache/tirex/tiles
ModTileRequestTimeout 0
ModTileMissingRequestTimeout 60
=====================================
debian/etc/tirex/tirex.conf
=====================================
@@ -14,17 +14,17 @@ stats_dir=/var/cache/tirex/stats
#metatile_columns=8
# The name of the UNIX domain socket for communicating with ModTile.
-#modtile_socket_name=/var/lib/tirex/modtile.sock
+modtile_socket_name=/run/tirex/modtile.sock
# Directory where UNIX domain sockets are created
-#socket_dir=/var/run/tirex
+socket_dir=/run/tirex
#-----------------------------------------------------------------------------
# MASTER
#-----------------------------------------------------------------------------
# The master writes its process ID into this file.
-#master_pidfile=/var/run/tirex/tirex-master.pid
+master_pidfile=/run/tirex/tirex-master.pid
# Syslog facility used in tirex-master.
#master_syslog_facility=daemon
@@ -49,7 +49,7 @@ bucket name=background minprio=20 maxproc=2 maxload=4
#-----------------------------------------------------------------------------
# The tirex-backend-manager writes its process ID into this file
-#backend_manager_pidfile=/var/run/tirex/tirex-backend-manager.pid
+backend_manager_pidfile=/run/tirex/tirex-backend-manager.pid
# Syslog facility used by tirex-backend-manager
#backend_manager_syslog_facility=daemon
@@ -64,7 +64,7 @@ bucket name=background minprio=20 maxproc=2 maxload=4
#-----------------------------------------------------------------------------
# The syncd process writes its process ID into this file
-#syncd_pidfile=/var/run/tirex/tirex-syncd.pid
+syncd_pidfile=/run/tirex/tirex-syncd.pid
# If this is defined, the syncd will copy rendered tiles to this server..
# A comma-separated list is allowed.
@@ -82,6 +82,6 @@ bucket name=background minprio=20 maxproc=2 maxload=4
# command to execute for replicating the space-separated list of files
# %FILES% to host %HOST%. By default uses a ssh connection with a
# persistent control connection that will be re-created on demand.
-#syncd_command=tar -C/ -cf - %FILES% | ssh %HOST% -oControlMaster=auto -oControlPersist=1h -oControlPath=/var/run/tirex/ssh-control-%h-%r-%p -Tq "tar -C/ -xf -"
+#syncd_command=tar -C/ -cf - %FILES% | ssh %HOST% -oControlMaster=auto -oControlPersist=1h -oControlPath=/run/tirex/ssh-control-%h-%r-%p -Tq "tar -C/ -xf -"
#-- THE END ------------------------------------------------------------------
=====================================
debian/tirex.install
=====================================
@@ -21,5 +21,8 @@ usr/share/perl5
etc/tirex/renderer/test.conf
etc/tirex/renderer/test/checkerboard.conf
etc/logrotate.d/tirex-master
-usr/lib/tirex/backends/test
-debian/etc/tirex/tirex.conf etc/tirex
+etc/tirex/renderer/mapnik.conf
+debian/etc/tirex/tirex.conf etc/tirex
+debian/tmpfiles.d/tirex.conf usr/lib/tmpfiles.d
+usr/lib/tirex/backends/mapnik usr/libexec
+usr/lib/tirex/backends/test usr/libexec
=====================================
debian/tirex.postinst
=====================================
@@ -22,13 +22,4 @@ case "$1" in
;;
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
-done
-
-dpkg-statoverride --list /var/log/tirex >/dev/null || \
- 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
-
#DEBHELPER#
=====================================
debian/tirex.tirex-backend-manager.init
=====================================
@@ -16,7 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Mapnik rendering daemon for Tirex"
NAME=tirex-backend-manager
DAEMON=/usr/bin/$NAME
-PIDFILE=/var/run/tirex/$NAME.pid
+PIDFILE=/run/tirex/$NAME.pid
DAEMON_ARGS=""
SCRIPTNAME=/etc/init.d/$NAME
=====================================
debian/tirex.tirex-backend-manager.simple-init
=====================================
@@ -16,7 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Mapnik rendering daemon for Tirex"
NAME=tirex-backend-manager
DAEMON=/usr/bin/$NAME
-PIDFILE=/var/run/tirex/$NAME.pid
+PIDFILE=/run/tirex/$NAME.pid
DAEMON_ARGS=""
SCRIPTNAME=/etc/init.d/$NAME
=====================================
debian/tirex.tirex-master.init
=====================================
@@ -17,7 +17,7 @@ DESC="Tirex master server"
NAME=tirex-master
DAEMON=/usr/bin/$NAME
DAEMON_ARGS=""
-PIDFILE=/var/run/tirex/$NAME.pid
+PIDFILE=/run/tirex/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
# Exit if the package is not installed
=====================================
debian/tirex.tirex-master.simple-init
=====================================
@@ -17,7 +17,7 @@ DESC="Tirex master server"
NAME=tirex-master
DAEMON=/usr/bin/$NAME
DAEMON_ARGS=""
-PIDFILE=/var/run/tirex/$NAME.pid
+PIDFILE=/run/tirex/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
# Exit if the package is not installed
=====================================
debian/tmpfiles.d/tirex.conf
=====================================
@@ -0,0 +1 @@
+d /run/tirex 0755 _tirex _tirex - -
View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/commit/16ce5ac988050d4e123e6e0f857826d91cea540d
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/tirex/-/commit/16ce5ac988050d4e123e6e0f857826d91cea540d
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/20210820/c5c604e7/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list