Here is an amended patch to replace harcoded /run/systemd/generator with
$1 (passed as an option to the generator). The change has been uploaded
in 0.12.0-1ubuntu2
Thanks Martin for noticing!
Cheers,
Didier
diff -Nru conmux-0.12.0/debian/changelog conmux-0.12.0/debian/changelog
--- conmux-0.12.0/debian/changelog 2014-06-23 15:25:15.000000000 +0200
+++ conmux-0.12.0/debian/changelog 2015-01-15 17:26:19.000000000 +0100
@@ -1,3 +1,17 @@
+conmux (0.12.0-2) unstable; urgency=medium
+
+ * Add systemd units in addition to the existing upstart one. Note that
+ all logs are redirected to the journal (syslog if installed) instead
+ of individual logs. You can use
+ journalctl -u conmux-daemon@<config_filename> to get individual daemon
+ logs. (Closes: #775185)
+ * Add debian/conmux-daemon-generator to generate dynamic systemd instances
+ based on /etc/conmux/*.cf.
+ * Bump Standards-Version.
+ * Removing HomePage: no homepage anymore for this project. (Closes: #759763)
+
+ -- Didier Roche <[email protected]> Thu, 15 Jan 2015 14:30:41 +0100
+
conmux (0.12.0-1) unstable; urgency=medium
* Upload 0.12.0-0ubuntu3 to unstable.
diff -Nru conmux-0.12.0/debian/conmux-daemon-generator
conmux-0.12.0/debian/conmux-daemon-generator
--- conmux-0.12.0/debian/conmux-daemon-generator 1970-01-01
01:00:00.000000000 +0100
+++ conmux-0.12.0/debian/conmux-daemon-generator 2015-01-15
17:26:26.000000000 +0100
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+GENERATORPATH=$1/conmux.service.d
+
+# Generate conmux-daemon instances hooked up in conmux service
+for f in /etc/conmux/*.cf; do
+ # if no file, we will get f=/etc/conmux/*.cf
+ [ ! -f "$f" ] && continue
+ configname=`basename "$f"`
+
+ [ ! -d "$GENERATORPATH" ] && mkdir -p "$GENERATORPATH"
+ echo "# Automatically generated by conmux-daemon-generator
+[Unit]
+Wants=conmux-daemon@${configname}.service" >
"$GENERATORPATH"/conmux-daemon-$configname.conf
+done
diff -Nru conmux-0.12.0/debian/[email protected]
conmux-0.12.0/debian/[email protected]
--- conmux-0.12.0/debian/[email protected] 1970-01-01 01:00:00.000000000
+0100
+++ conmux-0.12.0/debian/[email protected] 2015-01-15 17:26:19.000000000
+0100
@@ -0,0 +1,9 @@
+[Unit]
+Description=CONMUX daemon for /etc/conmux/%I
+Requires=conmux.service
+After=conmux.service
+ConditionFileNotEmpty=/etc/conmux/%I
+
+[Service]
+ExecStart=/usr/sbin/conmux /etc/conmux/%I
+Restart=on-failure
diff -Nru conmux-0.12.0/debian/conmux.install
conmux-0.12.0/debian/conmux.install
--- conmux-0.12.0/debian/conmux.install 2011-03-02 20:00:47.000000000 +0100
+++ conmux-0.12.0/debian/conmux.install 2015-01-15 17:26:19.000000000 +0100
@@ -3,3 +3,4 @@
conmux/lib/helpers usr/share/conmux
conmux/sbin usr
usr/share/perl*/Conmux.pm
+debian/conmux-daemon-generator lib/systemd/system-generators/
diff -Nru conmux-0.12.0/debian/conmux.service
conmux-0.12.0/debian/conmux.service
--- conmux-0.12.0/debian/conmux.service 1970-01-01 01:00:00.000000000 +0100
+++ conmux-0.12.0/debian/conmux.service 2015-01-15 17:26:19.000000000 +0100
@@ -0,0 +1,9 @@
+[Unit]
+Description=CONMUX registry
+
+[Service]
+ExecStart=/bin/sh -ec "touch /var/run/conmux-registry && exec
/usr/sbin/conmux-registry 63000 /var/run/conmux-registry"
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff -Nru conmux-0.12.0/debian/control conmux-0.12.0/debian/control
--- conmux-0.12.0/debian/control 2014-06-23 15:23:54.000000000 +0200
+++ conmux-0.12.0/debian/control 2015-01-15 17:26:19.000000000 +0100
@@ -1,10 +1,10 @@
Source: conmux
-Maintainer: Anibal Monsalve Salazar <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Anibal Monsalve Salazar <[email protected]>
Section: net
Priority: optional
-Standards-Version: 3.9.5
-Homepage: http://autotest.kernel.org/wiki/Conmux
-Build-Depends: debhelper (>= 8~)
+Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 8~), dh-systemd
Package: conmux
Architecture: all
diff -Nru conmux-0.12.0/debian/rules conmux-0.12.0/debian/rules
--- conmux-0.12.0/debian/rules 2011-03-02 20:00:47.000000000 +0100
+++ conmux-0.12.0/debian/rules 2015-01-15 17:26:19.000000000 +0100
@@ -17,6 +17,7 @@
override_dh_installinit:
dh_installinit
dh_installinit -n --name=conmux-daemon
+ dh_installinit -n --name=conmux-daemon@
%:
- dh $@
+ dh $@ --with systemd
