From 7baee36853d0fae399a951918c2b8ebe4e6da6a8 Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Mon, 20 Jan 2014 22:43:12 +0100
Subject: refactor vim configuration

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

(limited to 'ship/lib')

diff --git a/ship/lib/vim b/ship/lib/vim
new file mode 100644
index 00000000..de1ec5b0
--- /dev/null
+++ b/ship/lib/vim
@@ -0,0 +1,37 @@
+# configure vim
+
+vimrc=$HOME/.vimrc
+
+vim_conf_sane_defaults(){
+    cat >>$vimrc<<EOF
+set nocompatible
+filetype plugin indent on
+syntax on
+set vb
+set foldenable
+set foldmethod=syntax
+set ignorecase
+set incsearch
+set showmatch
+set matchtime=3
+set hlsearch
+set backupdir=~/.vim/backup
+set directory=~/.vim/backup
+inoremap <F1> <ESC>
+nnoremap <F1> <ESC>
+vnoremap <F1> <ESC>
+set wildignore=*.o,*.obj,*.bak,*.exe,*.os
+colorscheme darkblue
+set background=dark
+set number
+set mouse=
+set shiftwidth=2
+set tabstop=2
+set et
+set sw=2
+set smarttab
+set autoindent
+set backspace=indent,eol,start
+set nocp
+EOF
+}
-- 
cgit v1.2.3


From a774db6b3d89a106689fb1365f65b4a49c2dedec Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Mon, 20 Jan 2014 22:45:54 +0100
Subject: ship fix typo

---
 ship/lib/vim | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ship/lib')

diff --git a/ship/lib/vim b/ship/lib/vim
index de1ec5b0..43173585 100644
--- a/ship/lib/vim
+++ b/ship/lib/vim
@@ -3,6 +3,7 @@
 vimrc=$HOME/.vimrc
 
 vim_conf_sane_defaults(){
+    # TODO - make stuff more modular?
     cat >>$vimrc<<EOF
 set nocompatible
 filetype plugin indent on
@@ -34,4 +35,5 @@ set autoindent
 set backspace=indent,eol,start
 set nocp
 EOF
+    mkdir -p $HOME/.vim/backup
 }
-- 
cgit v1.2.3


From f46851de1af7c044471523c40e0fe88579b8a997 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 20 Feb 2014 18:50:20 +0100
Subject: add proposal for find-supers

this script may be used when bootstrapping new retiolum nodes
---
 ship/lib/retiolum | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 ship/lib/retiolum

(limited to 'ship/lib')

diff --git a/ship/lib/retiolum b/ship/lib/retiolum
new file mode 100644
index 00000000..015537bd
--- /dev/null
+++ b/ship/lib/retiolum
@@ -0,0 +1,76 @@
+#!/bin/sh
+# retiolum host functions
+#@include core
+netname=${netname:-retiolum}
+
+
+check_free_v4(){
+  myipv4=${1-10.243.0.-1}
+  v4num=${myipv4##*.}
+  printf "Retard check: "
+  if [ "$v4num" -gt 0 -a "$v4num" -lt "256" ];
+  then 
+    info "No retard detected\n"
+    cd /etc/tinc/$netname/hosts
+    info "Check if ip is still free: "
+    for i in `ls -1`; do
+      if grep -q -e $myipv4\$ $i ;then
+        warn "Host IP already taken by $i! "
+        return 1
+      fi
+    done
+    info "Passed\n"
+    return 0
+  else
+    error "you are made of stupid. bailing out\n" 
+    return 1
+  fi
+  cd - >/dev/null
+}
+
+find_active_nodes(){
+  # TODO this function currently only supports a single address for a host
+  cd /etc/tinc/retiolum/hosts
+  # posix grep does not support [[:space:]]
+  for name in `
+    grep '^[  ]*Address[  ]*=' * |
+      cut -d: -f1 | sort | uniq
+  `; do
+    if eval "`sed -n '
+        s/[   ]\+//g
+        s/^\(Address\|Port\)=\(.*\)/\1="\${\1+\$\1\n}\2"/p
+      ' $name`"; then
+      port=${Port-655}
+      for host in $Address; do
+        if nc -zw 2 $host $port 2>/dev/null; then
+          echo "$name [('$host', $port)]"
+        fi &
+      done
+      wait
+    fi &
+  done
+  wait
+  cd - >/dev/null
+}
+find_supernodes(){
+  cd /etc/tinc/retiolum/hosts
+  for name in `
+    grep '^[  ]*Address[  ]*=' * |
+      cut -d: -f1 | sort | uniq
+  `; do
+    if eval "`sed -n '
+        s/[   ]\+//g
+        s/^\(Address\|Port\)=\(.*\)/\1="\${\1+\$\1\n}\2"/p
+      ' $name`"; then
+      port=${Port-655}
+      for host in $Address; do
+        if nc -zw 2 $host $port 2>/dev/null; then
+          echo "$name [('$host', $port)]"
+        fi &
+      done
+      wait
+    fi &
+  done
+  wait
+  cd - >/dev/null
+}
-- 
cgit v1.2.3


From 1046da40ddc283cdec9d3156ecd6a37117c083cf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 21 Feb 2014 13:23:05 +0100
Subject: add //ship/src/refresh-supers

this script updates the currently configured supernodes in
/etc/tinc/retiolum/tinc.conf with 5 random working supernodes in the retiolum
darknet.
The tinc.conf file can be given via environment.
the hosts should be up-to-date in order to find all available supernodes.
---
 ship/lib/retiolum | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'ship/lib')

diff --git a/ship/lib/retiolum b/ship/lib/retiolum
index 015537bd..2a5c7338 100644
--- a/ship/lib/retiolum
+++ b/ship/lib/retiolum
@@ -1,8 +1,9 @@
 #!/bin/sh
 # retiolum host functions
 #@include core
+tinc_path=${tinc_path:-/etc/tinc}
 netname=${netname:-retiolum}
-
+hosts_dir=${hosts_dir:-$tinc_path/$netname/hosts}
 
 check_free_v4(){
   myipv4=${1-10.243.0.-1}
@@ -11,7 +12,7 @@ check_free_v4(){
   if [ "$v4num" -gt 0 -a "$v4num" -lt "256" ];
   then 
     info "No retard detected\n"
-    cd /etc/tinc/$netname/hosts
+    cd $hosts_dir
     info "Check if ip is still free: "
     for i in `ls -1`; do
       if grep -q -e $myipv4\$ $i ;then
@@ -30,8 +31,9 @@ check_free_v4(){
 
 find_active_nodes(){
   # TODO this function currently only supports a single address for a host
-  cd /etc/tinc/retiolum/hosts
+  cd $hosts_dir
   # posix grep does not support [[:space:]]
+  set +f
   for name in `
     grep '^[  ]*Address[  ]*=' * |
       cut -d: -f1 | sort | uniq
@@ -53,7 +55,8 @@ find_active_nodes(){
   cd - >/dev/null
 }
 find_supernodes(){
-  cd /etc/tinc/retiolum/hosts
+  cd $hosts_dir
+  set +f
   for name in `
     grep '^[  ]*Address[  ]*=' * |
       cut -d: -f1 | sort | uniq
-- 
cgit v1.2.3


From be4d573b21895449e57a8263a5a9ca292500a74b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 26 Feb 2014 17:04:54 +0100
Subject: sort //ship/lib/retiolum

---
 ship/lib/retiolum | 56 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'ship/lib')

diff --git a/ship/lib/retiolum b/ship/lib/retiolum
index 2a5c7338..3956a200 100644
--- a/ship/lib/retiolum
+++ b/ship/lib/retiolum
@@ -5,34 +5,9 @@ tinc_path=${tinc_path:-/etc/tinc}
 netname=${netname:-retiolum}
 hosts_dir=${hosts_dir:-$tinc_path/$netname/hosts}
 
-check_free_v4(){
-  myipv4=${1-10.243.0.-1}
-  v4num=${myipv4##*.}
-  printf "Retard check: "
-  if [ "$v4num" -gt 0 -a "$v4num" -lt "256" ];
-  then 
-    info "No retard detected\n"
-    cd $hosts_dir
-    info "Check if ip is still free: "
-    for i in `ls -1`; do
-      if grep -q -e $myipv4\$ $i ;then
-        warn "Host IP already taken by $i! "
-        return 1
-      fi
-    done
-    info "Passed\n"
-    return 0
-  else
-    error "you are made of stupid. bailing out\n" 
-    return 1
-  fi
-  cd - >/dev/null
-}
 
-find_active_nodes(){
-  # TODO this function currently only supports a single address for a host
+find_supernodes(){
   cd $hosts_dir
-  # posix grep does not support [[:space:]]
   set +f
   for name in `
     grep '^[  ]*Address[  ]*=' * |
@@ -54,8 +29,11 @@ find_active_nodes(){
   wait
   cd - >/dev/null
 }
-find_supernodes(){
+
+find_active_nodes(){
+  # TODO this function currently only supports a single address for a host
   cd $hosts_dir
+  # posix grep does not support [[:space:]]
   set +f
   for name in `
     grep '^[  ]*Address[  ]*=' * |
@@ -77,3 +55,27 @@ find_supernodes(){
   wait
   cd - >/dev/null
 }
+
+check_free_v4(){
+  myipv4=${1-10.243.0.-1}
+  v4num=${myipv4##*.}
+  printf "Retard check: "
+  if [ "$v4num" -gt 0 -a "$v4num" -lt "256" ];
+  then 
+    info "No retard detected\n"
+    cd $hosts_dir
+    info "Check if ip is still free: "
+    for i in `ls -1`; do
+      if grep -q -e $myipv4\$ $i ;then
+        warn "Host IP already taken by $i! "
+        return 1
+      fi
+    done
+    info "Passed\n"
+    return 0
+  else
+    error "you are made of stupid. bailing out\n" 
+    return 1
+  fi
+  cd - >/dev/null
+}
-- 
cgit v1.2.3


From d818d26256380d1be91cb3d449271da96adb2105 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 26 Feb 2014 22:53:35 +0100
Subject: implement IRC proposal to refresh supernodes

//ship/src/refresh-supers is the script which will update your tinc config and
choose 5 working supernodes for you to connect to.

This proposal may become part of the tinc.krebsco.de install script
---
 ship/lib/retiolum | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'ship/lib')

diff --git a/ship/lib/retiolum b/ship/lib/retiolum
index 3956a200..1e55041c 100644
--- a/ship/lib/retiolum
+++ b/ship/lib/retiolum
@@ -1,10 +1,28 @@
 #!/bin/sh
 # retiolum host functions
 #@include core
+#@include network
 tinc_path=${tinc_path:-/etc/tinc}
 netname=${netname:-retiolum}
 hosts_dir=${hosts_dir:-$tinc_path/$netname/hosts}
+supernode_urls="http://euer.krebsco.de/retiolum/supernodes.tar.gz"
+reload_tinc(){
+  info "reloading tinc configuration"
+  pkill -HUP tincd || tinc -n $netname reload;
+}
 
+refresh_supernode_keys(){
+  for url in $supernode_urls;do
+    info "Trying $url to retrieve supernodes"
+    if http_get "$url" \
+       | tar xvz -C $hosts_dir | xargs -n1 echo "refreshed:" ;then
+      info "refreshed supernode keys"
+      return 0
+    else
+      error "$url unusable for retrieving supernode host files"
+    fi
+  done && return 1
+}
 
 find_supernodes(){
   cd $hosts_dir
@@ -67,7 +85,7 @@ check_free_v4(){
     info "Check if ip is still free: "
     for i in `ls -1`; do
       if grep -q -e $myipv4\$ $i ;then
-        warn "Host IP already taken by $i! "
+        error "Host IP already taken by $i! "
         return 1
       fi
     done
-- 
cgit v1.2.3


From 3bf91dd3f4569f17c0077938bef65f8df1050d72 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 28 Feb 2014 01:51:55 +0100
Subject: add zsh to punani db

---
 ship/lib/_punani_db | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ship/lib')

diff --git a/ship/lib/_punani_db b/ship/lib/_punani_db
index 721b5fa2..609baf07 100644
--- a/ship/lib/_punani_db
+++ b/ship/lib/_punani_db
@@ -39,6 +39,10 @@ _punanidb_pacman_tinc=tinc
 _punanidb_yum_tinc=tinc
 _punanidb_aptget_tinc=tinc
 
+_punanidb_pacman_zsh=zsh
+_punanidb_yum_zsh=zsh
+_punanidb_aptget_zsh=zsh
+
 _punanidb_pacman_tor=tor
 _punanidb_yum_tor=tor
 _punanidb_aptget_tor=tor
-- 
cgit v1.2.3


From fb75532f8ac05761955ea25ed0d00ce66a6567db Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Fri, 7 Mar 2014 14:25:40 +0100
Subject: update env-bootstrapping

---
 ship/lib/vim | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ship/lib')

diff --git a/ship/lib/vim b/ship/lib/vim
index 43173585..f75f3d0e 100644
--- a/ship/lib/vim
+++ b/ship/lib/vim
@@ -22,6 +22,7 @@ inoremap <F1> <ESC>
 nnoremap <F1> <ESC>
 vnoremap <F1> <ESC>
 set wildignore=*.o,*.obj,*.bak,*.exe,*.os
+cmap w!! w !sudo tee > /dev/null %
 colorscheme darkblue
 set background=dark
 set number
-- 
cgit v1.2.3


From c6b10ba46ea17f4ff0bc2f666dc1237fbb643b9d Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Fri, 7 Mar 2014 14:26:52 +0100
Subject: whatweb is now up-to-date

---
 ship/lib/_punani_db | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ship/lib')

diff --git a/ship/lib/_punani_db b/ship/lib/_punani_db
index 609baf07..e5bf15b1 100644
--- a/ship/lib/_punani_db
+++ b/ship/lib/_punani_db
@@ -54,3 +54,4 @@ _punanidb_aptget_nano=nano
 _punanidb_pacman_vim=vim
 _punanidb_yum_vim=vim-enhanced
 _punanidb_aptget_vim=vim
+
-- 
cgit v1.2.3


From 2c7569f73fc49f0ba0279d6db877bdfcfdee9bb7 Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Sun, 9 Mar 2014 12:44:49 +0100
Subject: make irc send verbose again

---
 ship/lib/network | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ship/lib')

diff --git a/ship/lib/network b/ship/lib/network
index 974fb282..bc4d1047 100644
--- a/ship/lib/network
+++ b/ship/lib/network
@@ -95,5 +95,5 @@ send_irc(){
       echo "JOIN $IRCCHANNEL";
       sleep 23;
       while read line; do echo "PRIVMSG $IRCCHANNEL :$line";sleep 1;done
-      sleep 5; ) | run_telnet $IRCSERVER $IRCPORT 2>/dev/null | line_to_dot
+      sleep 5; ) | run_telnet $IRCSERVER $IRCPORT 2>/dev/null
 }
-- 
cgit v1.2.3


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')

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 2e79508767ce5414c013aa4ee32722662ab6a79c Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Sun, 9 Mar 2014 12:45:40 +0100
Subject: add lib to deploy pubkeys for user

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

(limited to 'ship/lib')

diff --git a/ship/lib/krebs b/ship/lib/krebs
new file mode 100644
index 00000000..e47031d6
--- /dev/null
+++ b/ship/lib/krebs
@@ -0,0 +1,16 @@
+#@include core
+krebs_pubkeys="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7YrLdnXDRU2XEdZDu1BmgiT0Vaxplf3bfvSm+5o3g4AcR2yCv7h2D633c9uA0gq52EJ3V5m8B1ZcxqA0zqDptKwx+ZTMUGDls7StH5xpJyk9j5gf8DzyDLQPQG2IYszCH+8esKjo3BOFxfey8NaX+k6gvQsG3lyV0PjLvvIy4gDuMn6dPZfVAlwNYFOUNgwpku3W3A0d+UFyVjt3/sgZxM+8C3y6QE1gwT5/NfBbHM5vaEqjHcVq1ui+7a4iOXFGKkZDcd7EX6cQZSbCzZL7sZ0OmB1WpAsDCvIXfzX1YfNA0sso7ldSF6ZUGNgwEk1LootnQlCK/dfbM+i62SZ+1 tv@iiso
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCv9TTt4FkzT3jlQ0VS2tX/GpQO9Ef0wIQ+g96foe4qSniBwR667T1gIhURrod/p7N9oQcWRrNohjgmSBZRYA0kW6ZyqYJkLvRv54nXv6j/8Xq2nG/KVfDqL0kp8if+JGeFlQElpWJiAbGifYkopFy69QiLYU2ndR7aPbx+5qm/dcwPJ7K+n6dyePynCZadtcabm3PuBFUxGLdT9ImDXMOPfXxPMlN/3eb78byuEuHnhCIvIGLMBGx+8QTXvu7kHpZObvkbsF1xjVs9fDpwVLjh7GWdwf3BZ/agFlI24ffyqCPFnuaxUVyfUZeqf4twRsIZkTTB47lHDhYiVkyGe8gd root@pigstarter.de
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl3RTOHd5DLiVeUbUr/GSiKoRWknXQnbkIf+uNiFO+XxiqZVojPlumQUVhasY8UzDzj9tSDruUKXpjut50FhIO5UFAgsBeMJyoZbgY/+R+QKU00Q19+IiUtxeFol/9dCO+F4o937MC0OpAC10LbOXN/9SYIXueYk3pJxIycXwUqhYmyEqtDdVh9Rx32LBVqlBoXRHpNGPLiswV2qNe0b5p919IGcslzf1XoUzfE3a3yjk/XbWh/59xnl4V7Oe7+iQheFxOT6rFA30WYwEygs5As//ZYtxvnn0gA02gOnXJsNjOW9irlxOUeP7IOU6Ye3WRKFRR0+7PS+w8IJLag2xb makefu@pornocauster
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7df1RfMGNHPJe0iF6rD9DBs/4VujN6nNr7RbRCFk7HF/JzLXSn9Vcwk+3JefP4/d/bUo0h03rhQaRohDhBScrJidj2YacF6gmZOuTf3AMWprdz9D/1dDkN/ytwzGhADhqbHEWeomIllsa8Up4PvEeDcIHJGzYvuc0BbGqRk0XgxwqIrLAhdpTfEKaTbt7IzmUqEofxThTZ/4k020PKn2WDBWKQYGZJ9Ba2WzlKUXWx842ncW29oxC2faRz4M3eMPy0JMpBLkK9U3dccE75dgT/89/4ofVjM7+J3FOP3dgXzrtk+A5aN5a/veJUViQ9xdGxXvoa++iCr5q/BVRv0Bb sammy@muhbaasu.de
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDOIRWLC4ESCDxjyoJUqaUNC8ZDiE4UICZk3cbDptdtendTQvjSXz0RW6MWhJ+F6wWZntL1EibKn8djax1tzgcvNASCUEtGey/850IzBIrETs+WQDRjV2QqBKWxVaQPIFjw2V3vFSKKNxq01qznVBY510DIf4+0WR8b1ZPD/XbuyQLGYM3N7dP4JQSnnNAgtyutBKdomWfT18hW1lLjkP8h1IOiC03HxXTYX+nMUiLDff3D5GT5u3Ke2+VigXjz4Ue8rVsOg/zgqrwEAfx8o1q83uSB23oqUqWkqlxOC/4QY5kpdNqW/Iz89zHibp5ZceHd2ZSoGefv7UZM0lRIDHjJ retiolum@ire
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3+2vSwiJoIpHpnkw4SslPrlR6/z43nZ7s1tGXkkNnVDB2uzxMaISNRjSk0GgXpDx4hLEi6074hSvv5JWbUuMyKr9n6GVVeYNCjsiPcRkL3d7zDwFwqyndhVeWgmpuylYx4XKIbTvpBVyG3CRT1+D4apVUgiDa9lVfjBk7/ESxBzt0dXtlJEzQBBoCo0C8jeeIpvZKbq1zeM9wvLsgFaT7fsSxrg5BEb/tQl6pbkykWFXbzzd91liEQaSqai7Ux2355ZXGANQBCTglKhdTcir0RuHNtQGrZHBxL9qVfJjJJNZg1b6UAhDanqE/HyOI3sp6LGBvpW5afLKOdj9ppQQN retiolum@nomic
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== death@uriel"
+
+authorized_keys_file="${authorized_keys:-$HOME/.ssh/authorized_keys}"
+deploy_krebs_pubkeys(){
+info "deploying pubkeys in $authorized_keys_file"
+mkdir -p "$(dirname "$authorized_keys_file")"
+printf "$krebs_pubkeys\n" >> "$authorized_keys_file"
+
+}
-- 
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')

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')

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 ee63a28d029408a9a3012917a5169df5addd239a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 10 Mar 2014 23:06:50 +0100
Subject: add volid finder for remastering scripts

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

(limited to 'ship/lib')

diff --git a/ship/lib/iso b/ship/lib/iso
new file mode 100644
index 00000000..0776d796
--- /dev/null
+++ b/ship/lib/iso
@@ -0,0 +1,7 @@
+get_volid(){
+  #returns the volume id of the iso given
+  # is needed for remastering the archlinux iso
+  
+  #punani install genisoimage
+  isoinfo -d -i "${1?path to iso must be given}" | grep "^Volume id:" | cut -d: -f 2 |xargs
+}
-- 
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')

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')

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 +++---
 ship/lib/network    | 11 +++++++++++
 ship/lib/retiolum   | 16 +++++++++++++---
 3 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'ship/lib')

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 ||:
 }
 
diff --git a/ship/lib/network b/ship/lib/network
index bc4d1047..6c8970a0 100644
--- a/ship/lib/network
+++ b/ship/lib/network
@@ -76,6 +76,17 @@ run_telnet(){
   port="$2"
   $(which_telnet) "$host" "$port"
 }
+port_open(){
+  # $1 - host
+  # $2 - port
+  #  nc -zw 2 $1 $2
+  echo | run_telnet "$1" "$2" & pid=$!
+  { sleep 5; kill $pid;} & wid=$!
+  wait $pid 
+  RET=$?
+  kill $wid >/dev/null 2>&1
+  return $RET
+}
 
 send_irc(){
   ## reads from stdin, writes to IRC
diff --git a/ship/lib/retiolum b/ship/lib/retiolum
index 1e55041c..eba2775e 100644
--- a/ship/lib/retiolum
+++ b/ship/lib/retiolum
@@ -23,7 +23,17 @@ refresh_supernode_keys(){
     fi
   done && return 1
 }
-
+port_open(){
+  # $1 - host
+  # $2 - port
+  #  nc -zw 2 $1 $2
+  echo | run_telnet "$1" "$2" & pid=$!
+  { sleep 5; kill $pid;} & wid=$!
+  wait $pid 
+  RET=$?
+  kill $wid >/dev/null 2>&1
+  return $RET
+}
 find_supernodes(){
   cd $hosts_dir
   set +f
@@ -37,7 +47,7 @@ find_supernodes(){
       ' $name`"; then
       port=${Port-655}
       for host in $Address; do
-        if nc -zw 2 $host $port 2>/dev/null; then
+        if port_open $host $port 2>/dev/null; then
           echo "$name [('$host', $port)]"
         fi &
       done
@@ -63,7 +73,7 @@ find_active_nodes(){
       ' $name`"; then
       port=${Port-655}
       for host in $Address; do
-        if nc -zw 2 $host $port 2>/dev/null; then
+        if port_open $host $port 2>/dev/null; then
           echo "$name [('$host', $port)]"
         fi &
       done
-- 
cgit v1.2.3


From 92fe3350fe6e3da26fa1ad0522aabaa0f146d575 Mon Sep 17 00:00:00 2001
From: makefu <root@pigstarter.de>
Date: Mon, 5 May 2014 09:53:32 +0200
Subject: Merge all the shits

---
 ship/lib/_punani_db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ship/lib')

diff --git a/ship/lib/_punani_db b/ship/lib/_punani_db
index e5bf15b1..6f89029f 100644
--- a/ship/lib/_punani_db
+++ b/ship/lib/_punani_db
@@ -19,7 +19,7 @@ _punanidb_aptget_pip2=python-pip
 _punanidb_pacman_virtualenv=python-virtualenv
 _punanidb_aptget_virtualenv=python-virtualenv
 
-_punanidb_pacman_gpp=g++
+_punanidb_pacman_gpp=gcc
 _punanidb_aptget_gpp=gcc
 
 _punanidb_pacman_python2_dev=python2
-- 
cgit v1.2.3