diff options
| -rw-r--r-- | Refactory/Makefile | 2 | ||||
| -rwxr-xr-x | infest/skel/etc/profile | 2 | ||||
| -rw-r--r-- | retiolum/Makefile | 7 | ||||
| -rwxr-xr-x | retiolum/bin/check-free-retiolum-v4 | 5 | ||||
| -rw-r--r-- | retiolum/scripts/adv_graphgen/Makefile | 4 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/parse.py | 2 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/sanitize.sh | 18 | ||||
| -rw-r--r-- | retiolum/scripts/tinc_setup/write_channel.py | 1 |
8 files changed, 26 insertions, 15 deletions
diff --git a/Refactory/Makefile b/Refactory/Makefile new file mode 100644 index 00000000..57b983df --- /dev/null +++ b/Refactory/Makefile @@ -0,0 +1,2 @@ +install: + ln -snf $$PWD/bin/git-clone-into ../bin/ diff --git a/infest/skel/etc/profile b/infest/skel/etc/profile index 2812c86c..6c0dc852 100755 --- a/infest/skel/etc/profile +++ b/infest/skel/etc/profile @@ -2,6 +2,8 @@ export EDITOR=vi +# from original debian /etc/profile +PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" set -u alias bc='bc -q' alias df='df -h' diff --git a/retiolum/Makefile b/retiolum/Makefile index 407d8c60..c80a6faa 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -8,9 +8,10 @@ links: for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done hosts: - bin/update-retiolum-hosts + bin/update-retiolum-hosts || true install: update + @#punani -Ei tinc python @# will not run automatically scripts/tinc_setup/install.sh scripts/autostart/create-startup.sh @@ -18,10 +19,10 @@ install: update update: hosts @echo creating Magic bin/update_tinc_hosts "create magic" || true - @echo adding hosts + @echo adding hosts bin/update_tinc_hosts restart arch-install: update install arch-autostart autohosts arch-autostart: - make -C scripts/autostart arch + make -C scripts/autostart arch || true diff --git a/retiolum/bin/check-free-retiolum-v4 b/retiolum/bin/check-free-retiolum-v4 index e9c6b3ce..3f0dbdf8 100755 --- a/retiolum/bin/check-free-retiolum-v4 +++ b/retiolum/bin/check-free-retiolum-v4 @@ -1,5 +1,4 @@ #! /bin/sh -set -x netname=retiolum myipv4=${1-10.7.7.-1} v4num=${myipv4##*.} @@ -10,12 +9,12 @@ then cd /etc/tinc/$netname/hosts printf "Check if ip is still free: " for i in `ls -1`; do - if grep $myipv4 $i &>/dev/null ;then + if grep -q -e $myipv4\$ $i ;then echo "Host IP already taken by $i! " exit 1 fi done - printf "Passed" + printf "Passed\n" else printf "you are made of stupid. bailing out\n" exit 1 diff --git a/retiolum/scripts/adv_graphgen/Makefile b/retiolum/scripts/adv_graphgen/Makefile new file mode 100644 index 00000000..fafac84e --- /dev/null +++ b/retiolum/scripts/adv_graphgen/Makefile @@ -0,0 +1,4 @@ +install: + #punani install graphviz + echo "add this line to your tinc.conf if you dare:" + echo 'GraphDumpFile = |/krebs/retiolum/scripts/adv_graphgen /srv/http/tmp/graphs/' diff --git a/retiolum/scripts/adv_graphgen/parse.py b/retiolum/scripts/adv_graphgen/parse.py index 0744b262..4b9314cc 100755 --- a/retiolum/scripts/adv_graphgen/parse.py +++ b/retiolum/scripts/adv_graphgen/parse.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python # -*- coding: utf8 -*- import sys diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 38281fba..df6216fa 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,17 +1,19 @@ +#!/bin/sh +HERE=$(dirname `readlink -f $0`) GRAPH_SETTER1=dot GRAPH_SETTER2=circo GRAPH_SETTER3='neato -Goverlap=prism ' GRAPH_SETTER4=sfdp -LOG_FILE=/var/log/everything.log +LOG_FILE=/var/log/syslog OPENER=/bin/true sudo pkill -USR2 tincd sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\ - ./parse.py > retiolum.dot + $HERE/parse.py > $HERE/retiolum.dot -$GRAPH_SETTER1 -Tpng -o $1retiolum_1.png retiolum.dot -$GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot -$GRAPH_SETTER3 -Tpng -o $1retiolum_3.png retiolum.dot -$GRAPH_SETTER4 -Tpng -o $1retiolum_4.png retiolum.dot -$OPENER retiolum_1.png &>/dev/null -rm retiolum.dot +$GRAPH_SETTER1 -Tpng -o $1/retiolum_1.png $HERE/retiolum.dot +$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $HERE/retiolum.dot +$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $HERE/retiolum.dot +$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $HERE/retiolum.dot +$OPENER $HERE/retiolum_1.png &>/dev/null +rm $HERE/retiolum.dot diff --git a/retiolum/scripts/tinc_setup/write_channel.py b/retiolum/scripts/tinc_setup/write_channel.py index a11d4605..ee28674f 100644 --- a/retiolum/scripts/tinc_setup/write_channel.py +++ b/retiolum/scripts/tinc_setup/write_channel.py @@ -12,6 +12,7 @@ FILE="/etc/tinc/retiolum/hosts/"+myname PORT=6667 NICK= myname+"_"+str(random.randint(23,666)) +print "Connecting..." sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM) sock.connect((HOST,PORT)) print NICK |