From 5c9d8118729c2e5524324bc340da45405ce69505 Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Sun, 9 Mar 2014 12:45:23 +0100
Subject: add filehooker ncdc pseudocode

---
 ship/lib/filehooker | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 ship/lib/filehooker

(limited to 'ship/lib/filehooker')

diff --git a/ship/lib/filehooker b/ship/lib/filehooker
new file mode 100644
index 00000000..fac84b93
--- /dev/null
+++ b/ship/lib/filehooker
@@ -0,0 +1,56 @@
+#@include core
+#@include tmux
+#
+netshare=
+dc_hub=${dc_hub:-adcs://localhost:2781}
+ncdc_user=hooker
+ncdc_install(){
+curl http://dev.yorhel.nl/download/ncdc-linux-x86_64-1.19.tar.gz | tar xz -C /usr/bin/
+}
+
+
+
+ncdc_configure(){
+    # maybe we want to use the running ncdc process and communicate via tmux send-keys ?
+   (sleep 1;cat;printf "/quit\n") | sudo -u $ncdc_user
+# not implemented yet
+# /set active
+# /share $random $netshare
+:
+}
+ncdc_configure_netshare(){
+    :${1?provide path to share}
+    rnd=`hexdump -n 2 -e '/2 "%u"' /dev/urandom`
+    rnd_name="share_$rnd"
+    info "setting active as true"
+    info "adding share"
+    (echo "/set active true" ;
+    echo "/share $rnd_name $1") | ncdc_configure
+
+}
+ncdc_configure_hub(){
+    info "configuring DC Hub: $dc_hub, activating autconnect"
+    (echo "/open c1 $dc_hub" ;
+    echo "/hset autoconnect true") | ncdc_configure
+}
+ncdc_autostart(){
+# only systemd
+# punani install tmux
+cat > /etc/systemd/system/ncdc@.service <<EOF
+[Unit]
+Description=ncdc
+Requires=network.target local-fs.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+KillMode=none
+User=%I
+ExecStart=/usr/bin/tmux new-session -s dcpp -n ncdc -d ncdc
+ExecStop=/usr/bin/tmux send-keys -t dcpp:ncdc "/quit" C-m
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable ncdc@$ncdc_user
+}
-- 
cgit v1.2.3


From fc166354da369e4a9e3e635d5026ecf4f8ee11f4 Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Sun, 9 Mar 2014 21:44:17 +0100
Subject: ship:/lib/filehooker set nick

---
 ship/lib/filehooker | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

(limited to 'ship/lib/filehooker')

diff --git a/ship/lib/filehooker b/ship/lib/filehooker
index fac84b93..bd658c42 100644
--- a/ship/lib/filehooker
+++ b/ship/lib/filehooker
@@ -1,22 +1,13 @@
 #@include core
-#@include tmux
-#
+
 netshare=
 dc_hub=${dc_hub:-adcs://localhost:2781}
-ncdc_user=hooker
-ncdc_install(){
-curl http://dev.yorhel.nl/download/ncdc-linux-x86_64-1.19.tar.gz | tar xz -C /usr/bin/
-}
-
+ncdc_user=${ncdc_user:-hooker}
 
 
-ncdc_configure(){
+ncdc_config(){
     # maybe we want to use the running ncdc process and communicate via tmux send-keys ?
    (sleep 1;cat;printf "/quit\n") | sudo -u $ncdc_user
-# not implemented yet
-# /set active
-# /share $random $netshare
-:
 }
 ncdc_configure_netshare(){
     :${1?provide path to share}
@@ -25,14 +16,27 @@ ncdc_configure_netshare(){
     info "setting active as true"
     info "adding share"
     (echo "/set active true" ;
-    echo "/share $rnd_name $1") | ncdc_configure
+    echo "/share $rnd_name $1") | ncdc_config
+}
 
+ncdc_configure_nick(){
+    nick=${1?nick must be provided}
+    info "configuring DC Nick: $nick"
+    echo "/nick $nick" | ncdc_config
 }
 ncdc_configure_hub(){
-    info "configuring DC Hub: $dc_hub, activating autconnect"
-    (echo "/open c1 $dc_hub" ;
-    echo "/hset autoconnect true") | ncdc_configure
+    hub=${1:-$dc_hub}
+    info "configuring DC Hub: $hub, activating autconnect"
+    (echo "/open c1 ${hub}" ;
+    echo "/hset autoconnect true") | ncdc_config
 }
+
+
+ncdc_install(){
+curl http://dev.yorhel.nl/download/ncdc-linux-x86_64-1.19.tar.gz | tar xz -C /usr/bin/
+useradd -m $ncdc_user ||:
+}
+
 ncdc_autostart(){
 # only systemd
 # punani install tmux
-- 
cgit v1.2.3


From 0970f673456cf8bef932aef048bb89f6178eb104 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 9 Mar 2014 22:32:48 +0100
Subject: ship:implement ncdc configuration

---
 ship/lib/filehooker | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'ship/lib/filehooker')

diff --git a/ship/lib/filehooker b/ship/lib/filehooker
index bd658c42..a6987733 100644
--- a/ship/lib/filehooker
+++ b/ship/lib/filehooker
@@ -1,14 +1,12 @@
 #@include core
-
-netshare=
-dc_hub=${dc_hub:-adcs://localhost:2781}
 ncdc_user=${ncdc_user:-hooker}
-
+ncdc_bin=${ncdc_bin:-/usr/bin/ncdc}
 
 ncdc_config(){
     # maybe we want to use the running ncdc process and communicate via tmux send-keys ?
-   (sleep 1;cat;printf "/quit\n") | sudo -u $ncdc_user
+   (sleep 1;cat;printf "/quit\n") | sudo -u $ncdc_user "$ncdc_bin"
 }
+
 ncdc_configure_netshare(){
     :${1?provide path to share}
     rnd=`hexdump -n 2 -e '/2 "%u"' /dev/urandom`
@@ -25,15 +23,19 @@ ncdc_configure_nick(){
     echo "/nick $nick" | ncdc_config
 }
 ncdc_configure_hub(){
-    hub=${1:-$dc_hub}
+    rnd=`hexdump -n 2 -e '/2 "%u"' /dev/urandom`
+    hubname="hub_$rnd"
+    hub=${1?adcs://localhost:2781}
     info "configuring DC Hub: $hub, activating autconnect"
-    (echo "/open c1 ${hub}" ;
+    (echo "/open ${hubname} ${hub}" ;
     echo "/hset autoconnect true") | ncdc_config
 }
 
 
 ncdc_install(){
-curl http://dev.yorhel.nl/download/ncdc-linux-x86_64-1.19.tar.gz | tar xz -C /usr/bin/
+install_dir="$(dirname "${ncdc_bin}")"
+info "installing ncdc to $install_dir"
+curl http://dev.yorhel.nl/download/ncdc-linux-x86_64-1.19.tar.gz | tar xz -C "$install_dir"
 useradd -m $ncdc_user ||:
 }
 
-- 
cgit v1.2.3


From e2cf4fc92569487e21d096ac6879177aac8f73c1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 16 Mar 2014 12:55:24 +0100
Subject: update tor_announce

---
 ship/lib/filehooker | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'ship/lib/filehooker')

diff --git a/ship/lib/filehooker b/ship/lib/filehooker
index a6987733..5e6def5d 100644
--- a/ship/lib/filehooker
+++ b/ship/lib/filehooker
@@ -1,4 +1,5 @@
 #@include core
+#@include network
 ncdc_user=${ncdc_user:-hooker}
 ncdc_bin=${ncdc_bin:-/usr/bin/ncdc}
 
@@ -60,3 +61,25 @@ WantedBy=multi-user.target
 EOF
 systemctl enable ncdc@$ncdc_user
 }
+
+install_tor_announce(){
+# systemd only
+cat > /etc/systemd/system/tor_announce.service<<EOF
+[Unit]
+Description=Announce Tor Hidden Address
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/tor_announce
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+http_get conf.krebsco.de/tor_publish_ssh > /usr/bin/tor_annouce 
+chmod +x /usr/bin/tor_annouce
+systemctl enable tor_announce
+systemctl start tor_announce
+}
-- 
cgit v1.2.3


From d40950a555d594365307fca7a5a23a360a15645c Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Sun, 16 Mar 2014 12:56:15 +0100
Subject: update filehooker

---
 ship/lib/filehooker | 40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

(limited to 'ship/lib/filehooker')

diff --git a/ship/lib/filehooker b/ship/lib/filehooker
index a6987733..a2fba840 100644
--- a/ship/lib/filehooker
+++ b/ship/lib/filehooker
@@ -8,13 +8,12 @@ ncdc_config(){
 }
 
 ncdc_configure_netshare(){
-    :${1?provide path to share}
+    : "${1?provide path to share}"
     rnd=`hexdump -n 2 -e '/2 "%u"' /dev/urandom`
-    rnd_name="share_$rnd"
-    info "setting active as true"
+    rnd_name="${2:-share_$rnd}"
     info "adding share"
-    (echo "/set active true" ;
-    echo "/share $rnd_name $1") | ncdc_config
+    
+    (echo "/share $rnd_name $1") | ncdc_config
 }
 
 ncdc_configure_nick(){
@@ -27,6 +26,7 @@ ncdc_configure_hub(){
     hubname="hub_$rnd"
     hub=${1?adcs://localhost:2781}
     info "configuring DC Hub: $hub, activating autconnect"
+    info "setting active as true"
     (echo "/open ${hubname} ${hub}" ;
     echo "/hset autoconnect true") | ncdc_config
 }
@@ -60,3 +60,33 @@ WantedBy=multi-user.target
 EOF
 systemctl enable ncdc@$ncdc_user
 }
+
+# 20gig in bytes
+min_netshare_size=${min_netshare_size:-20000000000}
+get_disksize(){
+fdisk -l ${1?provide disk} | grep '^Disk ' | cut -d\  -f 5
+}
+
+prepare_netshares(){
+    count=0
+    fdisk -l  | grep '^Disk '  | egrep '(/dev/sd|/dev/hd)' | cut -d\  -f 2 | tr -d : | while read disk;do
+        size=$(get_disksize $disk)
+        if test "$size" -gt "$min_netshare_size";
+        then
+            info "using $disk with $size bytes"
+            dd if=/dev/zero of=$disk bs=1M count=1 >/dev/null
+            sleep 1
+            (printf "o\nn\np\n\n\n\nw\n\n") |fdisk $disk >/dev/null ||:
+            #partprobe $disk
+            mkfs.btrfs -f ${disk}1 >/dev/null
+            uuid="$(blkid ${disk}1 -o value | head -n 1)"
+            mountpoint="/media/vag${count}"
+            mkdir -p "$mountpoint"
+            echo "UUID=$uuid  $mountpoint btrfs rw,relatime,space_cache 0 0" >> /etc/fstab
+            echo "$mountpoint"
+            : $((count++))
+        else
+            info "skipping $disk"
+        fi
+    done
+}
-- 
cgit v1.2.3


From 95fbba75246cf1b5115bc5493d3119f9ea91221e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 27 Apr 2014 18:18:08 +0200
Subject: update things

---
 ship/lib/filehooker | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ship/lib/filehooker')

diff --git a/ship/lib/filehooker b/ship/lib/filehooker
index 3c881f91..72be751a 100644
--- a/ship/lib/filehooker
+++ b/ship/lib/filehooker
@@ -13,7 +13,6 @@ ncdc_configure_netshare(){
     rnd=`hexdump -n 2 -e '/2 "%u"' /dev/urandom`
     rnd_name="${2:-share_$rnd}"
     info "adding share"
-    
     (echo "/share $rnd_name $1") | ncdc_config
 }
 
@@ -32,11 +31,12 @@ ncdc_configure_hub(){
     echo "/hset autoconnect true") | ncdc_config
 }
 
-
-ncdc_install(){
+ncdc_download(){
 install_dir="$(dirname "${ncdc_bin}")"
 info "installing ncdc to $install_dir"
 curl http://dev.yorhel.nl/download/ncdc-linux-x86_64-1.19.tar.gz | tar xz -C "$install_dir"
+}
+ncdc_install(){
 useradd -m $ncdc_user ||:
 }
 
-- 
cgit v1.2.3