diff options
author | makefu <github@syntax-fehler.de> | 2012-12-07 22:34:39 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2012-12-07 22:34:39 +0100 |
commit | ad09d521243d9275d2af99b5aa5b67b9f79d3a77 (patch) | |
tree | e0d2b03045b62fbda60f9fb59d8e7be12d4a2e43 /retiolum/scripts/tinc_setup | |
parent | bedf7d79f297e3584757e8ebf3995aafd46daf7a (diff) |
write_channel.py rewritten to announce_pubkey
announce_pubkey is a shell-only implementation of the now obsolete write_channel script to announce a hosts public key
the only dependency of this script is telnet, haven't seen a system without it for a while now
Diffstat (limited to 'retiolum/scripts/tinc_setup')
-rwxr-xr-x | retiolum/scripts/tinc_setup/install.sh | 2 | ||||
-rw-r--r-- | retiolum/scripts/tinc_setup/write_channel.py | 27 |
2 files changed, 1 insertions, 28 deletions
diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index a6b50b8a..2e36b83a 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -73,7 +73,7 @@ if [ ! -e rsa_key.priv ] then echo "creating new keys" tincd -n $netname -K - python ${CURR}/write_channel.py $myname || \ + $MYBIN/announce_pubkey $myname || \ echo "cannot write public key to IRC, you are on your own. Good Luck" else echo "key files already exist, skipping" diff --git a/retiolum/scripts/tinc_setup/write_channel.py b/retiolum/scripts/tinc_setup/write_channel.py deleted file mode 100644 index 8299fa8d..00000000 --- a/retiolum/scripts/tinc_setup/write_channel.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/python -import random, sys, time, socket -try: - myname=sys.argv[1] -except: - print("you are made of stupid") - exit (23) - -CHANNEL = '#krebsco' -HOST='irc.freenode.net' -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) -sock.send("NICK %s\r\n" % NICK) -sock.send("USER %s %s bla : %s\r\n" %(NICK,HOST,NICK)) -sock.send("JOIN %s\r\n" % CHANNEL) -time.sleep(23) -f = open(FILE,'r') -a = [ sock.send("PRIVMSG %s : %s" % ( CHANNEL,line)) for line in f] -time.sleep(5) #because irc is so lazy -print("closing socket") -sock.close() |