From e9529c145094ef4c7fefa3ad400491f3f080048a Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 19 Feb 2018 13:32:55 +0100
Subject: [PATCH] tor-dam initscripts upstreamed.

---
 decode.blend                                |  1 +
 rootfs-overlay/common/etc/init.d/dam-client | 21 ---------------------
 rootfs-overlay/common/etc/init.d/dam-dir    | 17 -----------------
 rootfs-overlay/common/etc/rc.local          |  9 ---------
 4 files changed, 1 insertion(+), 47 deletions(-)
 delete mode 100755 rootfs-overlay/common/etc/init.d/dam-client
 delete mode 100755 rootfs-overlay/common/etc/init.d/dam-dir
 delete mode 100755 rootfs-overlay/common/etc/rc.local

diff --git a/decode.blend b/decode.blend
index fd67cac..900d05d 100644
--- a/decode.blend
+++ b/decode.blend
@@ -143,6 +143,7 @@ torpass="\$(echo "\$(shuf -n 2 /usr/share/dict/words --random-source=/dev/urando
 sed -i python/damhs.py -e "s/topkek/\${torpass}/"
 sed -i python/damauth.py -e "s/topkek/\${torpass}/"
 make install
+make install-init
 
 torpass="\$(sudo -u debian-tor tor --hash-password "\${torpass}")"
 sed -e 's/User tor/User debian-tor/' < contrib/torrc > /etc/tor/torrc
diff --git a/rootfs-overlay/common/etc/init.d/dam-client b/rootfs-overlay/common/etc/init.d/dam-client
deleted file mode 100755
index d04faf8..0000000
--- a/rootfs-overlay/common/etc/init.d/dam-client
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/home/decode/go/bin/dam-client
-pidfile=/var/run/dam-client.pid
-
-description="Tor DAM client"
-
-depend() {
-	after dam-dir
-}
-
-start() {
-	start-stop-daemon --start \
-		-u decode -g decode \
-		--make-pidfile --pidfile $pidfile \
-		--background \
-		--startas /bin/bash -- -c \
-		"exec $command >> /var/log/dam-client.log 2>&1"
-}
diff --git a/rootfs-overlay/common/etc/init.d/dam-dir b/rootfs-overlay/common/etc/init.d/dam-dir
deleted file mode 100755
index 656c85d..0000000
--- a/rootfs-overlay/common/etc/init.d/dam-dir
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/home/decode/go/bin/dam-dir
-pidfile=/var/run/dam-dir.pid
-
-description="Tor DAM server"
-
-depend() {
-	after logger
-}
-
-start() {
-	start-stop-daemon --start -u decode -g decode \
-		--pidfile $pidfile -b -m -x $command
-}
diff --git a/rootfs-overlay/common/etc/rc.local b/rootfs-overlay/common/etc/rc.local
deleted file mode 100755
index 45f3938..0000000
--- a/rootfs-overlay/common/etc/rc.local
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# rc.local for base images
-
-[ -f /etc/ssh/ssh_host_rsa_key.pub ] || ssh-keygen -A
-[ -f /etc/part-expand.sh ] && /etc/part-expand.sh
-
-netdata
-
-exit 0