From f6d06241c7efddddcf5d8df18869b7cc184ddf02 Mon Sep 17 00:00:00 2001 From: parazyd Date: Tue, 23 Jan 2018 13:17:13 +0100 Subject: [PATCH] Add tor-dam installation. ut --- config | 3 +++ decode.blend | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/config b/config index 4050890..7b00ae4 100644 --- a/config +++ b/config @@ -24,6 +24,8 @@ multichain_url="https://www.multichain.com/download/multichain-${multichain_vers stem_version="1.6.0" stem_url="https://git.torproject.org/stem.git" +tordam_url="github.com/parazyd/tor-dam/..." + size="4098" filesystem="btrfs" @@ -47,6 +49,7 @@ extra_packages+=( redis-tools redis-server paxctl + net-tools python2.7 python3 diff --git a/decode.blend b/decode.blend index ff8bc04..a01e1bd 100644 --- a/decode.blend +++ b/decode.blend @@ -132,6 +132,32 @@ EOF chroot-script install-golang || zerr } ## }}} +## {{{ blend_install_tordam() +blend_install_tordam() { + fn blend_install_tordam + req=(strapdir tordam_url) + ckreq || return 1 + + notice "installing tor-dam in $strapdir" + cat </dev/null +#!/bin/sh +sudo -u decode go get -u ${tordam_url} +cd /home/decode/go/src/github.com/decodeproject/tor-dam + +# A random password for the Tor Controlport auth +torpass="$(echo "$(shuf -n 2 /usr/share/dict/words --random-source=/dev/urandom | tr '\n' '-')")" +sed -i python/damhs.py -e 's/topkek/${torpass}/' +sed -i python/damauth.py -e 's/topkek/${torpass}/' +make install + +torpass="$(tor --hash-password "${torpass}")" +sed -e 's/User tor/User debian-tor/' \ + -e 's/HashedControlPassword .*/HashedControlPassword ${torpass}/' \ + < contrib/torrc > /etc/tor/torrc +EOF + chroot-script install-tordam || zerr +} +## }}} ## {{{ blend_install_netdata() blend_install_netdata() { fn blend_install_netdata