diff options
| author | Felix Richter <github@syntax-fehler.de> | 2011-05-26 13:59:47 +0200 |
|---|---|---|
| committer | Felix Richter <github@syntax-fehler.de> | 2011-05-26 13:59:47 +0200 |
| commit | aea8e374caa9ba8cbb1bc3cff39753fbfe0e3605 (patch) | |
| tree | 920504afe7eaa4963b0bf6c00d83ea6c48a0082d /retiolum/hosts | |
| parent | 32c1be4902f05a262715af6af4714d344f80bd93 (diff) | |
fixed borken parse script
wrong behaviour when we do not know the internal ip of a node for some reason.
fixed autostart script to modprobe tun before continuning
Diffstat (limited to 'retiolum/hosts')
| -rwxr-xr-x | retiolum/hosts/.scripts/adv_graphgen/parse.py | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | retiolum/hosts/.scripts/autostart/tinc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/retiolum/hosts/.scripts/adv_graphgen/parse.py b/retiolum/hosts/.scripts/adv_graphgen/parse.py index b0534d93..04b42c33 100755 --- a/retiolum/hosts/.scripts/adv_graphgen/parse.py +++ b/retiolum/hosts/.scripts/adv_graphgen/parse.py @@ -1,4 +1,5 @@ #!/usr/bin/python2 +# -*- coding: utf8 -*- import sys """ TODO: Refactoring needed to pull the edges out of the node structures again, @@ -44,7 +45,8 @@ def write_node(k,v): node += "external:"+v['external-ip']+":"+v['external-port']+"\\l" if v.has_key('num_conns'): node += "Num Connects:"+str(v['num_conns'])+"\\l" - node += "internal:"+v['internal-ip']+"\\l\"" + + node += "internal:"+v.get('internal-ip','¯\\\\(°_o)/¯')+"\\l\"" if v['external-ip'] == "MYSELF": node += ",fillcolor=steelblue1" node += "]" diff --git a/retiolum/hosts/.scripts/autostart/tinc b/retiolum/hosts/.scripts/autostart/tinc index 06d10403..12e77d6a 100644..100755 --- a/retiolum/hosts/.scripts/autostart/tinc +++ b/retiolum/hosts/.scripts/autostart/tinc @@ -25,6 +25,8 @@ TCONF="/etc/tinc" NETSFILE="$TCONF/nets.boot" NETS="" +modprobe tun + test -f $DAEMON || exit 0 [ -r /etc/default/tinc ] && . /etc/default/tinc |