summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2013-11-07 17:12:26 +0100
committermakefu <github@syntax-fehler.de>2013-11-07 17:12:26 +0100
commita8abfcd05b5518ddacf5ccdf86bfff6528784eea (patch)
tree0b772566e0b242ff847f13e4257f9ee9f31fa500
parent5bdc93597ee1fc7318b8d093191c177a56f156d2 (diff)
ship: fix tor build
-rwxr-xr-xship/src/tor8
1 files changed, 5 insertions, 3 deletions
diff --git a/ship/src/tor b/ship/src/tor
index fa0c929f..df904444 100755
--- a/ship/src/tor
+++ b/ship/src/tor
@@ -1,7 +1,7 @@
#!/bin/sh
#@include core
-
-
+#@include network
+#@include punani
# can be set via env:
# torrc - path to torrc (default: /etc/tor/torrc )
# hidden_service_dir - path to hidden service (default: /var/lib/tor/hidden_service/ )
@@ -9,7 +9,9 @@
torrc=${torrc:-/etc/tor/torrc}
hidden_service_dir=${hidden_service_dir:-/var/lib/tor/hidden_service/}
-test -w "$torrc" || ( error "$torrc is not writable!"; exit 1 )
+punani install tor
+
+test -w "$torrc" || ( error "$torrc is not writable!"; exit 1 ) || exit 1
if ! grep -q '^HiddenService' "$torrc" ;then
info "adding hidden service to $torrc"
cat >> "$torrc" << EOF