diff options
Diffstat (limited to 'retiolum/scripts')
| -rw-r--r-- | retiolum/scripts/adv_graphgen/Makefile | 4 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/parse.py | 5 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/sanitize.sh | 19 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/tinc-up | 6 | ||||
| -rw-r--r-- | retiolum/scripts/tinc_setup/write_channel.py | 1 |
5 files changed, 22 insertions, 13 deletions
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..0bcf42a0 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 @@ -47,6 +47,7 @@ def write_node(k,v): edges are weightet with the informations inside the nodes provided by tinc """ + node = " "+k+"[label=\"" node += k+"\\l" node += "external:"+v['external-ip']+":"+v['external-port']+"\\l" @@ -57,7 +58,7 @@ def write_node(k,v): node +="\"" if v['external-ip'] == "MYSELF": node += ",fillcolor=steelblue1" - node +=",group="+v['external-ip'].replace(".","")+"" + node +=",group=\""+v['external-ip'].replace(".","")+"\"" node += "]" print node diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 38281fba..1dc43bf4 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,17 +1,20 @@ +#!/bin/sh +HERE=$(dirname `readlink -f $0`) +TMP=/tmp 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 > $TMP/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 $TMP/retiolum.dot +$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $TMP/retiolum.dot +$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $TMP/retiolum.dot +$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $TMP/retiolum.dot +$OPENER $HERE/retiolum_1.png &>/dev/null +rm $TMP/retiolum.dot diff --git a/retiolum/scripts/tinc_setup/tinc-up b/retiolum/scripts/tinc_setup/tinc-up index ae7c68e6..9a557787 100755 --- a/retiolum/scripts/tinc_setup/tinc-up +++ b/retiolum/scripts/tinc_setup/tinc-up @@ -4,15 +4,15 @@ dirname="`dirname "$0"`" conf=$dirname/tinc.conf -name=`sed -rn 's|^ *Name *= *([^ ]*) *$|\1|p' $conf` +name=`sed -n 's|^ *Name *= *\([^ ]*\) *$|\1|p' $conf` host=$dirname/hosts/$name route4=10.7.7.0/24 -addr4=`sed -rn 's|^ *Subnet *= *(10\.[^ ]*) *$|\1|p' $host` +addr4=`sed -n 's|^ *Subnet *= *\(10\.[^ ]*\) *$|\1|p' $host` route6=42::/16 -addr6=`sed -rn 's|^ *Subnet *= *(42:[^ ]*) *$|\1|p' $host` +addr6=`sed -n 's|^ *Subnet *= *\(42:[^ ]*\) *$|\1|p' $host` ifconfig $INTERFACE up $addr4 route add -net $route4 dev $INTERFACE 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 |