From b56137d875f43026aeabcc4403252e5e7008b93a Mon Sep 17 00:00:00 2001 From: EUcancER Date: Tue, 23 Aug 2011 23:51:24 +0000 Subject: check-free-retiolum: fixed bug which produces wrong match --- retiolum/bin/check-free-retiolum-v4 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'retiolum') 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 -- cgit v1.2.3 From efe72ae286caa4ecf88edcbcb619fb0ceb886ca8 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Fri, 26 Aug 2011 11:48:02 +0200 Subject: adv_graphgen: add HERE variable to launch from every dir --- retiolum/Makefile | 7 ++++--- retiolum/scripts/adv_graphgen/sanitize.sh | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'retiolum') 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/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 -- cgit v1.2.3 From 9a7a3afcb949ebe807965d154c00836c462177ff Mon Sep 17 00:00:00 2001 From: EUcancER Date: Thu, 1 Sep 2011 11:00:15 +0200 Subject: adv_graphgen: fix sanitize and parse sanitze.sh now creates dot file in temp directory parse now correctly creates group attribute --- retiolum/scripts/adv_graphgen/parse.py | 3 ++- retiolum/scripts/adv_graphgen/sanitize.sh | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/adv_graphgen/parse.py b/retiolum/scripts/adv_graphgen/parse.py index 4b9314cc..0bcf42a0 100755 --- a/retiolum/scripts/adv_graphgen/parse.py +++ b/retiolum/scripts/adv_graphgen/parse.py @@ -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 df6216fa..1dc43bf4 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,5 +1,6 @@ #!/bin/sh HERE=$(dirname `readlink -f $0`) +TMP=/tmp GRAPH_SETTER1=dot GRAPH_SETTER2=circo GRAPH_SETTER3='neato -Goverlap=prism ' @@ -9,11 +10,11 @@ OPENER=/bin/true sudo pkill -USR2 tincd sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\ - $HERE/parse.py > $HERE/retiolum.dot + $HERE/parse.py > $TMP/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 +$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 $HERE/retiolum.dot +rm $TMP/retiolum.dot -- cgit v1.2.3 From 5c4c3f42724812dd3426da5ba3d4cba44bf06803 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 6 Sep 2011 22:56:51 +0200 Subject: //retiolum/hosts: also has v4, again --- retiolum/hosts/also | 1 + 1 file changed, 1 insertion(+) (limited to 'retiolum') diff --git a/retiolum/hosts/also b/retiolum/hosts/also index 14001d7a..4d118f31 100644 --- a/retiolum/hosts/also +++ b/retiolum/hosts/also @@ -1,4 +1,5 @@ Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128 +Subnet = 10.7.7.23 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry Euy3v3s0ps/GMdE52gUbFB+bhM99hHiKW+7zcxnoMJ69a9yK6VG0Im+7ib0WTliZ -- cgit v1.2.3 From 229b805732cc34c30bb287aa750fbd14df94cc81 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 6 Sep 2011 23:00:03 +0200 Subject: //retiolum update-retiolum-hosts: cd //retiolum first This commit enables to call the script from everywhere...^_^ --- retiolum/bin/update-retiolum-hosts | 3 +++ 1 file changed, 3 insertions(+) (limited to 'retiolum') diff --git a/retiolum/bin/update-retiolum-hosts b/retiolum/bin/update-retiolum-hosts index 7b2fa0e5..1fecfe15 100755 --- a/retiolum/bin/update-retiolum-hosts +++ b/retiolum/bin/update-retiolum-hosts @@ -7,6 +7,9 @@ if test "${nosudo-false}" != true -a `id -u` != 0; then exit 23 # go to hell fi +# cd //retiolum +cd $(dirname $(readlink -f $0))/.. + mkdir -v -p /etc/tinc/retiolum/hosts cp -v -r hosts/* /etc/tinc/retiolum/hosts pkill -HUP tincd -- cgit v1.2.3