client/tripectl.c, debian: Fix logging privileges disaster.

[tripe] / debian / rules

diff --git a/debian/rules b/debian/rules
index e48ae0731382fa8a88bdaca47d74d8d32e5f0b25..b902fb6c2ca39caa865a58e2ee3f347818b880bc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ include $(CDBS)/class/autotools.mk
 ### General settings.
 
 DEB_BUILDDIR = $(CURDIR)/build
+DEB_MAKE_CHECK_TARGET = check
 
 ###--------------------------------------------------------------------------
 ### Correct configuration.
@@ -21,21 +22,35 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
        --with-tunnel="$(default_tunnel) slip" \
        --with-configdir="/etc/tripe" \
        --with-socketdir="/var/run" \
-       --with-logfile="/var/log/tripe.log" \
+       --with-logfile="/var/log/tripe/tripe.log" \
        --with-pidfile="/var/run/tripectl.pid" \
        --with-initconfig="/etc/default/tripe" \
-       --with-wireshark
+       --with-wireshark="/usr/lib/wireshark/libwireshark0/plugins"
+
+###--------------------------------------------------------------------------
+### Python.
+
+binary-install/python-tripe::
+       dh_pycentral -ppython-tripe
 
 ###--------------------------------------------------------------------------
 ### Install the startup scripts.
 
 install/tripe::
        cp $(DEB_BUILDDIR)/init/tripe-init debian/tripe.init
-       cp $(DEB_SRCDIR)/init/tripe.conf debian/tripe.default
+       sed 's/^#\(user\|group\)/\1/' \
+               $(DEB_SRCDIR)/init/tripe.conf >debian/tripe.default
 
 cleanbuilddir::
        rm -f debian/tripe.init debian/tripe.default
 
+###--------------------------------------------------------------------------
+### Install configuration files.
+
+install/tripe-peer-services::
+       install -m644 $(DEB_SRCDIR)/peerdb/peers.in \
+               debian/tripe-peer-services/etc/tripe/peers.d/10base
+
 ###--------------------------------------------------------------------------
 ### Wireshark plugin.