summaryrefslogtreecommitdiffstats
path: root/retiolum/scripts
diff options
context:
space:
mode:
authorEUcancER <root@euer.krebsco.de>2011-08-31 12:52:15 +0200
committerEUcancER <root@euer.krebsco.de>2011-08-31 12:52:15 +0200
commit8e2af5a9f643632b96564706313edd4524f81bfd (patch)
tree10e31222000cc4e289c555f6eb487502c273afb4 /retiolum/scripts
parentefe72ae286caa4ecf88edcbcb619fb0ceb886ca8 (diff)
parent9030631edd4f5e44234fe77348b92190874f42a2 (diff)
Gigantor Merge!
Conflicts: cholerab/news/Candidate - add Ante scriptum cholerab/shirts/bestellliste - merged as theirs oncology/dpfhack_display - now a submodule add bug-fixing for adv_graphgen, as well as a Makefile
Diffstat (limited to 'retiolum/scripts')
-rw-r--r--retiolum/scripts/adv_graphgen/Makefile4
-rwxr-xr-xretiolum/scripts/adv_graphgen/parse.py2
-rw-r--r--retiolum/scripts/tinc_setup/write_channel.py1
3 files changed, 6 insertions, 1 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..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/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