summaryrefslogtreecommitdiffstats
path: root/filehooker/root-image/krebs/bin
diff options
context:
space:
mode:
Diffstat (limited to 'filehooker/root-image/krebs/bin')
-rwxr-xr-xfilehooker/root-image/krebs/bin/filehooker_configure_ncdc.ship15
-rwxr-xr-xfilehooker/root-image/krebs/bin/filehooker_configure_netshare.ship7
-rwxr-xr-xfilehooker/root-image/krebs/bin/refresh-shares.ship11
-rwxr-xr-x[-rw-r--r--]filehooker/root-image/krebs/bin/start-ncdc.ship3
-rwxr-xr-xfilehooker/root-image/krebs/bin/tor-get-hidden-service.sh2
-rwxr-xr-xfilehooker/root-image/krebs/bin/tor_configure_hidden_service.ship (renamed from filehooker/root-image/krebs/bin/tor_announce.ship)8
-rwxr-xr-x[-rw-r--r--]filehooker/root-image/krebs/bin/vim_sane_defaults.ship0
7 files changed, 15 insertions, 31 deletions
diff --git a/filehooker/root-image/krebs/bin/filehooker_configure_ncdc.ship b/filehooker/root-image/krebs/bin/filehooker_configure_ncdc.ship
deleted file mode 100755
index 62d3b4f7..00000000
--- a/filehooker/root-image/krebs/bin/filehooker_configure_ncdc.ship
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env ship
-#TODO waiting for ship2
-#@info
-#@strict
-set -euf
-#@include filehooker
-. /krebs/lib/filehooker
-
-dc_hub="adcs://elch.nsupdate.info:2781"
-nick="$(cat /etc/hostname)"
-
-ncdc_install
-
-ncdc_configure_nick "$nick"
-ncdc_configure_hub "$dc_hub"
diff --git a/filehooker/root-image/krebs/bin/filehooker_configure_netshare.ship b/filehooker/root-image/krebs/bin/filehooker_configure_netshare.ship
deleted file mode 100755
index f45ffeac..00000000
--- a/filehooker/root-image/krebs/bin/filehooker_configure_netshare.ship
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#@info
-#@strict
-#@include filehooker
-#for i in $(prepare_netshares) ;do
- #ncdc_configure_netshare "$i" "${i##*/}"
-#done
diff --git a/filehooker/root-image/krebs/bin/refresh-shares.ship b/filehooker/root-image/krebs/bin/refresh-shares.ship
new file mode 100755
index 00000000..99c0b748
--- /dev/null
+++ b/filehooker/root-image/krebs/bin/refresh-shares.ship
@@ -0,0 +1,11 @@
+#!/bin/sh
+#TODO:
+#!/usr/bin/env ship
+set -euf
+#@include filehooker
+. /krebs/lib/filehooker
+ncdc_user="hooker"
+
+share_all_partitions
+
+exit 0
diff --git a/filehooker/root-image/krebs/bin/start-ncdc.ship b/filehooker/root-image/krebs/bin/start-ncdc.ship
index 393c05cc..e190ec06 100644..100755
--- a/filehooker/root-image/krebs/bin/start-ncdc.ship
+++ b/filehooker/root-image/krebs/bin/start-ncdc.ship
@@ -7,7 +7,7 @@ ncdc_user="hooker"
useradd -m $ncdc_user ||:
dc_hub="adcs://elch.nsupdate.info:2781"
-ncdc_configure_hub "$dc_hub"
+ncdc_configure_hub "$dc_hub" "elch"
nick=$(get_hostname)
ncdc_configure_nick "$nick"
@@ -15,3 +15,4 @@ ncdc_configure_nick "$nick"
share_all_partitions
sudo -u $ncdc_user /usr/bin/tmux new-session -s dcpp -n ncdc -d ncdc
+exit 0
diff --git a/filehooker/root-image/krebs/bin/tor-get-hidden-service.sh b/filehooker/root-image/krebs/bin/tor-get-hidden-service.sh
new file mode 100755
index 00000000..c9946366
--- /dev/null
+++ b/filehooker/root-image/krebs/bin/tor-get-hidden-service.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+cat /var/lib/tor/hidden_service/hostname
diff --git a/filehooker/root-image/krebs/bin/tor_announce.ship b/filehooker/root-image/krebs/bin/tor_configure_hidden_service.ship
index ec4f33b6..1e026d26 100755
--- a/filehooker/root-image/krebs/bin/tor_announce.ship
+++ b/filehooker/root-image/krebs/bin/tor_configure_hidden_service.ship
@@ -14,11 +14,3 @@ 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/vim_sane_defaults.ship b/filehooker/root-image/krebs/bin/vim_sane_defaults.ship
index fcc7ffcf..fcc7ffcf 100644..100755
--- a/filehooker/root-image/krebs/bin/vim_sane_defaults.ship
+++ b/filehooker/root-image/krebs/bin/vim_sane_defaults.ship