From 1d6c14a96984511a9e4bf607f04a92298fca9512 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 2 Apr 2014 04:10:21 +0200
Subject: using collectd and stuff

---
 filehooker/root-image/krebs/bin/add-reaktor-secret.sh | 17 ++++++++++++-----
 filehooker/root-image/krebs/bin/reaktor-shell.sh      |  4 ++++
 filehooker/root-image/krebs/bin/start-ncdc.ship       | 11 +++++++----
 filehooker/root-image/krebs/lib/filehooker            |  5 +++--
 4 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100755 filehooker/root-image/krebs/bin/reaktor-shell.sh

(limited to 'filehooker/root-image/krebs')

diff --git a/filehooker/root-image/krebs/bin/add-reaktor-secret.sh b/filehooker/root-image/krebs/bin/add-reaktor-secret.sh
index 8a3a5c6b..92681449 100755
--- a/filehooker/root-image/krebs/bin/add-reaktor-secret.sh
+++ b/filehooker/root-image/krebs/bin/add-reaktor-secret.sh
@@ -5,13 +5,20 @@ red='\e[0;31m'
 nc='\e[0m'
 black='\e[0;30m'
 
-printf "${green}Add a Reaktor Secret${nc}\n"
+printf "${green}Add a Reaktor Secret ${nc}\n"
+printf "${red}(no spaces in input plox)${nc}\n"
 
-printf "provide Nick Name:\n"
 nick=${1:-}
-test -z "${nick:-}" && read nick
-printf "provide Secret:$black\n" 
+while test -z "${nick:-}" ;do
+  printf "provide Nick Name:\n"
+  read nick
+done
+
 secret=${2:-}
-test -z "${secret:-}" && read secret
+while test -z "${secret:-}" ;do
+  printf "provide Secret:$black\n" 
+  read secret
+done
+
 echo "$nick $secret" >> /krebs/painload/Reaktor/admin.lst
 printf "${green}done${nc}"
diff --git a/filehooker/root-image/krebs/bin/reaktor-shell.sh b/filehooker/root-image/krebs/bin/reaktor-shell.sh
new file mode 100755
index 00000000..117c64f6
--- /dev/null
+++ b/filehooker/root-image/krebs/bin/reaktor-shell.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "IP Addresses:"
+/krebs/painload/Reaktor/commands/ips || echo "no IPs!"
+/krebs/bin/add-reaktor-secret.sh
diff --git a/filehooker/root-image/krebs/bin/start-ncdc.ship b/filehooker/root-image/krebs/bin/start-ncdc.ship
index 3251ef53..1d47bcfb 100755
--- a/filehooker/root-image/krebs/bin/start-ncdc.ship
+++ b/filehooker/root-image/krebs/bin/start-ncdc.ship
@@ -4,16 +4,19 @@ set -euf
 . /krebs/lib/filehooker
 #@include network
 ncdc_user="hooker"
+
 useradd -m $ncdc_user ||:
 
 sudo -u $ncdc_user /usr/bin/tmux new-session -s dcpp -n ncdc -d ncdc 2>/dev/null || echo "ncdc is already running"
 
-
-dc_hub="adcs://elch.nsupdate.info:2781"
+nick=$(cat /etc/hostname)
+echo "using nick $nick"
+ncdc_configure_nick "$nick"
+sleep 1
+dc_hub="adcs://elchhub.nsupdate.info:2781"
+echo "connecting to $dc_hub"
 ncdc_configure_hub "$dc_hub" "elch"
 
-nick=$(get_hostname)
-ncdc_configure_nick "$nick"
 
 share_all_partitions
 
diff --git a/filehooker/root-image/krebs/lib/filehooker b/filehooker/root-image/krebs/lib/filehooker
index c51be701..b3bef435 100644
--- a/filehooker/root-image/krebs/lib/filehooker
+++ b/filehooker/root-image/krebs/lib/filehooker
@@ -33,8 +33,9 @@ ncdc_configure_hub(){
     rnd=`hexdump -n 2 -e '/2 "%u"' /dev/urandom`
     hub=${1?adcs://localhost:2781}
     hubname="${2:-hub_$rnd}"
-    info "configuring DC Hub: $hub, activating autconnect"
     info "setting active as true"
+    (echo "/set active true") | ncdc_config
+    info "configuring DC Hub: $hub, activating autconnect"
     (echo "/open ${hubname} ${hub}" ;
     echo "/hset autoconnect true") | ncdc_config
 }
@@ -129,7 +130,7 @@ is_mounted(){
 share_all_partitions(){
     count=0
     # all /dev/sdX and all mapped devices
-    (find /dev -name '[shv]d[a-z][0-9]';find /dev/mapper ! -type d)| while read disk;do
+    (find /dev -name '[shv]d[a-z][0-9]';find /dev/mapper ! -type d ;find /dev -name 'md[0-9][0-9]*')| while read disk;do
         size=$(get_disksize $disk 2>/dev/null)
 
         if test "$size" -gt "$min_netshare_size" 2>/dev/null ; #&& ! is_mounted "$disk";
-- 
cgit v1.2.3