From d54b633fa363f4c04c77369b1add4c9120dbbba0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 19 Mar 2014 12:23:31 +0100
Subject: filehooker: tor is only configured, not published

---
 .../etc/systemd/system/tor-announce.service        | 11 ----------
 .../systemd/system/tor-configure-hidden.service    | 11 ++++++++++
 filehooker/root-image/krebs/bin/tor_announce.ship  | 24 ----------------------
 .../krebs/bin/tor_configure_hidden_service.ship    | 24 ++++++++++++++++++++++
 4 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 filehooker/root-image/etc/systemd/system/tor-announce.service
 create mode 100644 filehooker/root-image/etc/systemd/system/tor-configure-hidden.service
 delete mode 100755 filehooker/root-image/krebs/bin/tor_announce.ship
 create mode 100755 filehooker/root-image/krebs/bin/tor_configure_hidden_service.ship

(limited to 'filehooker/root-image')

diff --git a/filehooker/root-image/etc/systemd/system/tor-announce.service b/filehooker/root-image/etc/systemd/system/tor-announce.service
deleted file mode 100644
index 818a5c4c..00000000
--- a/filehooker/root-image/etc/systemd/system/tor-announce.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Announce Tor Hidden Address
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/krebs/bin/tor_announce.ship
-
-[Install]
-WantedBy=multi-user.target
diff --git a/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service b/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service
new file mode 100644
index 00000000..c9b8f20f
--- /dev/null
+++ b/filehooker/root-image/etc/systemd/system/tor-configure-hidden.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Announce Tor Hidden Address
+After=network.target nss-lookup.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/krebs/bin/tor_configure_hidden_service.ship
+
+[Install]
+WantedBy=multi-user.target
diff --git a/filehooker/root-image/krebs/bin/tor_announce.ship b/filehooker/root-image/krebs/bin/tor_announce.ship
deleted file mode 100755
index ec4f33b6..00000000
--- a/filehooker/root-image/krebs/bin/tor_announce.ship
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#@include core
-. /krebs/lib/core
-#@include network
-. /krebs/lib/network
-#@include tor
-. /krebs/lib/tor
-
-sleep_time=5
-test -w "$torrc" || ( error "$torrc is not writable!"; exit 1 ) || exit 1
-
-configure_hidden_service
-test ! -e $hidden_service_dir/hostname && \
-  info "hidden service file does not exist, restarting tor" && \
-  systemctl restart tor && \
-  sleep 1
-
-while ! internet;do
-  info "no internet yet, sleeping"
-  sleep $sleep_time
-done
-
-NICK=$(get_hostname)
-cat "$hidden_service_dir/hostname" | send_irc
diff --git a/filehooker/root-image/krebs/bin/tor_configure_hidden_service.ship b/filehooker/root-image/krebs/bin/tor_configure_hidden_service.ship
new file mode 100755
index 00000000..ec4f33b6
--- /dev/null
+++ b/filehooker/root-image/krebs/bin/tor_configure_hidden_service.ship
@@ -0,0 +1,24 @@
+#!/bin/sh
+#@include core
+. /krebs/lib/core
+#@include network
+. /krebs/lib/network
+#@include tor
+. /krebs/lib/tor
+
+sleep_time=5
+test -w "$torrc" || ( error "$torrc is not writable!"; exit 1 ) || exit 1
+
+configure_hidden_service
+test ! -e $hidden_service_dir/hostname && \
+  info "hidden service file does not exist, restarting tor" && \
+  systemctl restart tor && \
+  sleep 1
+
+while ! internet;do
+  info "no internet yet, sleeping"
+  sleep $sleep_time
+done
+
+NICK=$(get_hostname)
+cat "$hidden_service_dir/hostname" | send_irc
-- 
cgit v1.2.3