itSwitch the initscripts to supervise-daemon. - tordam - A library for peer discovery inside the Tor network	Err	parazyd.org	70
hgit clone https://git.parazyd.org/tordam	URL:https://git.parazyd.org/tordam	parazyd.org	70
1Log	/git/tordam/log.gph	parazyd.org	70
1Files	/git/tordam/files.gph	parazyd.org	70
1Refs	/git/tordam/refs.gph	parazyd.org	70
1README	/git/tordam/file/README.md.gph	parazyd.org	70
1LICENSE	/git/tordam/file/LICENSE.gph	parazyd.org	70
i---	Err	parazyd.org	70
1commit 81c0995b7351efe895b5d1e78a1083861cd9cbaa	/git/tordam/commit/81c0995b7351efe895b5d1e78a1083861cd9cbaa.gph	parazyd.org	70
1parent ca200bf9085b61c56fc9c54a5cb480fd98a24b08	/git/tordam/commit/ca200bf9085b61c56fc9c54a5cb480fd98a24b08.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Wed, 21 Mar 2018 15:40:33 +0100	Err	parazyd.org	70
i	Err	parazyd.org	70
iSwitch the initscripts to supervise-daemon.	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M contrib/dam-client.init             |      14 ++++++++------	Err	parazyd.org	70
i  M contrib/dam-dir.init                |      14 ++++++++------	Err	parazyd.org	70
i	Err	parazyd.org	70
i2 files changed, 16 insertions(+), 12 deletions(-)	Err	parazyd.org	70
i---	Err	parazyd.org	70
1diff --git a/contrib/dam-client.init b/contrib/dam-client.init	/git/tordam/file/contrib/dam-client.init.gph	parazyd.org	70
it@@ -14,14 +14,16 @@ depend() {	Err	parazyd.org	70
i start() {	Err	parazyd.org	70
i         ebegin "Starting $description"	Err	parazyd.org	70
i         _h="$(getent passwd $damuid | cut -d: -f6)"	Err	parazyd.org	70
i-        start-stop-daemon --start --background -u $damuid -g $damgid \	Err	parazyd.org	70
i-                --make-pidfile --pidfile $pidfile \	Err	parazyd.org	70
i-                --startas /bin/sh -- -c "export HOME=$_h && exec $command >> $damlog 2>&1"	Err	parazyd.org	70
i+        supervise-daemon -d $_h -e HOME=$_h -u $damuid -g $damgid \	Err	parazyd.org	70
i+                --pidfile $pidfile -1 $damlog -2 $damlog \	Err	parazyd.org	70
i+                --start $command	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i stop() {	Err	parazyd.org	70
i         ebegin "Stopping $description"	Err	parazyd.org	70
i-        _chld="$(pgrep -P $(cat $pidfile) | tr '\n' ' ')"	Err	parazyd.org	70
i-        kill $_chld || true	Err	parazyd.org	70
i-        start-stop-daemon --stop --pidfile $pidfile	Err	parazyd.org	70
i+        dcli="$(pgrep -P $(cat $pidfile))"	Err	parazyd.org	70
i+        dahs="$(pgrep -P $dcli)"	Err	parazyd.org	70
i+        supervise-daemon --stop $command -p $pidfile	Err	parazyd.org	70
i+        kill $dahs || true	Err	parazyd.org	70
i+        kill $dcli || true	Err	parazyd.org	70
i }	Err	parazyd.org	70
1diff --git a/contrib/dam-dir.init b/contrib/dam-dir.init	/git/tordam/file/contrib/dam-dir.init.gph	parazyd.org	70
it@@ -15,14 +15,16 @@ depend() {	Err	parazyd.org	70
i start() {	Err	parazyd.org	70
i         ebegin "Starting $description"	Err	parazyd.org	70
i         _h="$(getent passwd $damuid | cut -d: -f6)"	Err	parazyd.org	70
i-        start-stop-daemon --start --background -u $damuid -g $damgid \	Err	parazyd.org	70
i-                --make-pidfile --pidfile $pidfile \	Err	parazyd.org	70
i-                --startas /bin/sh -- -c "export HOME=$_h && exec $command >> $damlog 2>&1"	Err	parazyd.org	70
i+        supervise-daemon -d $_h -e HOME=$_h -u $damuid -g $damgid \	Err	parazyd.org	70
i+                --pidfile $pidfile -1 $damlog -2 $damlog \	Err	parazyd.org	70
i+                --start $command	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i stop() {	Err	parazyd.org	70
i         ebegin "Stopping $description"	Err	parazyd.org	70
i-        _chld="$(pgrep -P $(cat $pidfile) | tr '\n' ' ')"	Err	parazyd.org	70
i-        kill $_chld || true	Err	parazyd.org	70
i-        start-stop-daemon --stop --pidfile $pidfile	Err	parazyd.org	70
i+        ddir="$(pgrep -P $(cat $pidfile))"	Err	parazyd.org	70
i+        rdis="$(pgrep -P $ddir)"	Err	parazyd.org	70
i+        supervise-daemon --stop $command -p $pidfile	Err	parazyd.org	70
i+        kill $rdis || true	Err	parazyd.org	70
i+        kill $ddir || true	Err	parazyd.org	70
i }	Err	parazyd.org	70
.