From 2b907df0b472b00cc31e3188435e0032fad5a676 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 5 May 2011 00:27:40 +0200 Subject: updated to work with legacy os build_debian.sh: updated to work with legacy build_debian_clean.sh: debian build script with manual compiling install.sh: updated python to work with legacy software --- build_debian.sh | 6 +++--- build_debian_clean.sh | 31 +++++++++++++++++++++++++++++++ install.sh | 8 ++++---- 3 files changed, 38 insertions(+), 7 deletions(-) create mode 100755 build_debian_clean.sh diff --git a/build_debian.sh b/build_debian.sh index ecec41a3..3f21ec6e 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -2,8 +2,7 @@ set -x MYIP=10.0.7.7.55 -aptitude install tinc git - +apt-get install tinc git curl python git clone https://github.com/makefu/shack-retiolum.git @@ -11,6 +10,7 @@ cd shack-retiolum ./install.sh `hostname` $MYIP +rm shack-retiolum # for autostart echo "retiolum" >> /etc/tinc/nets.boot -echo "EXTRA=\"--user=tincd --chroot\"" >> /etc/default/tinc +echo "EXTRA=\"\"" >> /etc/default/tinc diff --git a/build_debian_clean.sh b/build_debian_clean.sh new file mode 100755 index 00000000..a7332f4e --- /dev/null +++ b/build_debian_clean.sh @@ -0,0 +1,31 @@ +#!/bin/bash +set -xe +MYIP=10.0.7.7.55 + +apt-get install tinc git curl gcc gcc-dev build-essential libssl-dev python + +git clone https://github.com/makefu/shack-retiolum.git + +mkdir build +cd build +curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar +xz +cd lzo-2.04 +./configure --prefix=/usr +make +sudo make install +cd .. +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install +cd ../.. + +cd shack-retiolum +./install.sh `hostname` $MYIP + +rm shack-retiolum +# for autostart +echo "retiolum" >> /etc/tinc/nets.boot +echo "EXTRA=\"--user=tincd --chroot\"" >> /etc/default/tinc diff --git a/install.sh b/install.sh index 5fa1d4a5..af461a30 100755 --- a/install.sh +++ b/install.sh @@ -47,7 +47,7 @@ CHANNEL = '#tincspasm' HOST='irc.freenode.net' FILE="/etc/tinc/retiolum/hosts/$myname" PORT=6667 -NICK= "$myname"+str(random.randint(23,666)) +NICK= "$myname_"+str(random.randint(23,666)) sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM) sock.connect((HOST,PORT)) @@ -56,9 +56,9 @@ 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) -with open(FILE,'r') as f: - a = [ sock.send("PRIVMSG %s : %s" % ( CHANNEL,line)) for line in f] - time.sleep(5) #because irc is so lazy +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() EOF -- cgit v1.2.3 From 8447dc900980937ee108167c38d662700c1aeb81 Mon Sep 17 00:00:00 2001 From: miefda Date: Thu, 5 May 2011 16:00:36 +0200 Subject: initial commit by supernode --- 5eruun | 9 +++++++++ Lassulus | 9 +++++++++ alphalabs | 9 +++++++++ also | 9 +++++++++ kaah | 11 +++++++++++ krebs | 9 +++++++++ miefda901 | 9 +++++++++ miefdahome | 11 +++++++++++ miefdat | 10 ++++++++++ no_omo | 9 +++++++++ pa_sharepoint | 7 +++++++ pfleidi | 9 +++++++++ pornocauster | 9 +++++++++ supernode | 10 ++++++++++ 14 files changed, 130 insertions(+) create mode 100644 5eruun create mode 100644 Lassulus create mode 100644 alphalabs create mode 100644 also create mode 100644 kaah create mode 100644 krebs create mode 100644 miefda901 create mode 100644 miefdahome create mode 100644 miefdat create mode 100644 no_omo create mode 100644 pa_sharepoint create mode 100644 pfleidi create mode 100644 pornocauster create mode 100644 supernode diff --git a/5eruun b/5eruun new file mode 100644 index 00000000..ca28c396 --- /dev/null +++ b/5eruun @@ -0,0 +1,9 @@ +Subnet = 10.7.7.128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA/YOSX4xEKitiVzIP0xFUKQvC01uKN+KCT2Y7H8MFzowB+GWdVvpl +Ri8TukMF1EYlIZoSIrgPO/SoOFZNvxPa83I6PeN6W830qKpUt3xYMqyuL2ZJw1hv +hsgPWbGXF2yA39mQas9Skf2SNnEJppFpN8mGw449PLhTFmGoR3x3354kgO40zts4 +qqvpMcyTOx+zQhnGBO4KQqftJU1klgCcYUHrN+ql5vq3u6YgMpUIczPnhN6Cnm+j +hys6sTXN/DFcpq6YGXTHSGZO1JTuAyfZHfXXgUtIbW5W03LLtkYcMIiaIafe+qiv +tAs3cZIEKZVp+1fdfypQok6nDPwC1jy8TwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/Lassulus b/Lassulus new file mode 100644 index 00000000..61c2d62b --- /dev/null +++ b/Lassulus @@ -0,0 +1,9 @@ +Subnet = 10.7.7.11 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE +H0QwkiMmk3aZy1beq3quM6gX13aT+/wMfWnLyuvT11T5C9JEf/IS91STpM2BRN+R ++P/DhbuDcW4UsdEe6uwQDGEJbXRN5ZA7GI0bmcYcwHJ9SQmW5v7P9Z3oZ+09hMD+ +1cZ3HkPN7weSdMLMPpUpmzCsI92cXGW0xRC4iBEt1ZeBwjkLCRsBFBGcUMuKWwVa +9sovca0q3DUar+kikEKVrVy26rZUlGuBLobMetDGioSawWkRSxVlfZvTHjAK5JzU +O6y6hj0yQ1sp6W2JjU8ntDHf63aM71dB9QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/alphalabs b/alphalabs new file mode 100644 index 00000000..6aea1dec --- /dev/null +++ b/alphalabs @@ -0,0 +1,9 @@ +Subnet = 10.7.7.10 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvUAbMmmOFn+4kOvJAvmi0R/XCQa1YBlkjUvC6Pmt0Q8gV1DodXjB +DgwP8yhLcxaVy2Hk82aJvNTUrfMeB2sdt1RJHQiEPQkHthdp8Spm0Px4uTiMjmFB +ev91xi00eCCGIKsXdh/qso1K7EDHt9MEVHOvSlkawWzoyJ6AaHStW1ElwDdGjZpl +0YWrhx4Gk5X7pCp3LKkQJFfGtqoqGOVg2JjqK3qMsAdRo6QvYDqjFzARed/D0k55 +kcKXjBJAVxoU/CqGfS/Lr0fL8tdYgXaAXvPO9dbr1t0KyOUY2KRNBePeSvRp/etb +H0LBPsO9F7PQiPI3DBoWCYgsuj/hBXapvwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/also b/also new file mode 100644 index 00000000..9f9dcd73 --- /dev/null +++ b/also @@ -0,0 +1,9 @@ +Subnet = 10.7.7.23 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry +Euy3v3s0ps/GMdE52gUbFB+bhM99hHiKW+7zcxnoMJ69a9yK6VG0Im+7ib0WTliZ +llgUfRETQd/2KaIfJWH/nVsBuK0hp1LscroWcoO08BCw6v94q3He8502Bk/ZYZQF +wD7Y6LldipWKo/K9YtIU3zD3taj2NGnetOc0BRRncSgGiicXJKhtfcs+Ti2Y/ITz +bFkHnFgB0KnhjwJBumxdmgjHWknlwVkROvmzIgyoXxqEw31bF+g/XzA7RTMXsiFM +w0SZ15k4HG5L1PWpUyY2Th5yIjMW+sSrhQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/kaah b/kaah new file mode 100644 index 00000000..d56014fa --- /dev/null +++ b/kaah @@ -0,0 +1,11 @@ +Address = kaah.ath.cx +Subnet = 10.7.7.21 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAtd9+R7NYs/5LmXoFakuoFzdO/8hy4MMeGjdDqbubKyJmIO/nvQWS +TQns55znLgPIapUtCijxphoQrcTB5LijVXFj/2uipqiOJHVmhA80NiQgYhrFG++x +9AQie2c04xqq+6Bptjs8vnQS6odLsBAiY1OJDpaEPZqzrpSMnYzEwPWqOAzzbVRd +SFDokIhm62xmDK0+M4H8l3zmMnInnxdHd0fMhBJr5lXXqdzXJ3zluU6fZyHysF4c +OnvFrGNrc3MPpgmzULVUUVg+Z4NeQYa5LuhXA9xia0R5d8ALCi34L4tAvCfSi1Lu +RSUiJHeWDvNzwIy9+hxofqqcJqA05kyGLQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/krebs b/krebs new file mode 100644 index 00000000..5c832b42 --- /dev/null +++ b/krebs @@ -0,0 +1,9 @@ +Subnet = 10.7.7.156 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAl6vUmUL8w8r2gUTpUF8QWx0U3nzDPao2I7l0WU1NnGcR8DVug7YN +595guvDkRGcM4eYGizgVYVvDCmjTQRXRn57ucVud2bGE1NGtdomVs6wggpgzLiaf +m9BJwsigoCyMv+8ewGfc+D10TupulcIiZSp/RAewYlX0rhmgdsEGnCt+TWvXRsIa +kY1pvt4YeKjs2ctib3OmaPuNokK4ophxSpdZ5arjHCaiVMj2O6pPAQbU7WFY63Fw +UP64cAmtqBM+uMteT7bdG1jT3KZS6W7Dy8rIBd+pp+vB656A5PhrDcGEUMFSXqPD +BwIxhV7OAejSn4XjrZyd5eNtMOQKopIMQwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/miefda901 b/miefda901 new file mode 100644 index 00000000..a1b59a29 --- /dev/null +++ b/miefda901 @@ -0,0 +1,9 @@ +Subnet = 10.7.7.22 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEApbEYmHf0vEDYa/2aVvWVxEGgC+JJlXcArdxkQooSIpnZfSAfsH0S +MFz8v7UkM7EJSwDsFWf+gxyoAORdFpdQm+XQoDqWVZ1e0isYtNluP2C/51s3lu2F +kVLZ+86el7zd4unHG+6CHmyaBcO5yV6VU8WFeuinB2+ojnujOWlHgOipMOrxsab8 +vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQnvsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7h +Bv6prIxCbpY7WMMtg0z+OlyGkQefVRl18kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnN +VoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4nwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/miefdahome b/miefdahome new file mode 100644 index 00000000..180bbde7 --- /dev/null +++ b/miefdahome @@ -0,0 +1,11 @@ +Address = 192.168.10.119 +Subnet = 10.7.7.30 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAopwKn000XAcoI61OqQ7cjgrPHm/jHmuB1LHeCUggWMOD78WDFNzq +8/l9ASlU9kbSZFhoMuBR5BPWgciYWsC1EqY1nRAc/Si1rUHnJw+Xcyl0MNsZ7Cef +WaFRvC1VNC3qlQp5/e+fi46oOp4i+BqlFSxe7Jrr0EVyBVTOw8rMGToqDsOih6M9 +SFvmVMOnqh7n8LEOUtAL4nID59k7CTXzoNhXc0cEJoBkC2YCexonb4ru/J8F2BRG +Y3yzHYVskBrrPie1JNhfUHGCABIbtODTiHQYH8NFTYzdBnVV88IWqiTBbmKcRf+j +zEyGyXu/3YLFfjmsi7ysT+BWLIPvkyr7/wIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/miefdat b/miefdat new file mode 100644 index 00000000..43e2a6e6 --- /dev/null +++ b/miefdat @@ -0,0 +1,10 @@ +Subnet = 10.7.7.20 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvCestFRcrr10nzSzc1l4Flkv6ZG5ijGneZBeDaP+bB3GhFx0BYzP +CQjcCFTcExVVAorknjX1/rjT60+dSBuJoH/pEeloPowtwm6YVgfhcQD/5qRHmAPF +Ss1pdiTVtyi0BmcqDGoOTcR/tR4v2LBEDnxK89wWIFWbeDeR6UyjD2psbFBal8Zd +TmkuBTg1OGPVhB+BmuKSqPBt6AtLV+0fKHdrTOVNwF2W/8lCVTd3uCVtnUEeTLrW +KA8h9C0K2gAxxhJTF3pJtR/YQPpgwXRg3CfzMKsvHNOsqfMnnk/WFM0vrSJSi2El +xCD5Pm/BPZyA8B4vhz8im4hWofOP2/JiNwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/no_omo b/no_omo new file mode 100644 index 00000000..f2398f18 --- /dev/null +++ b/no_omo @@ -0,0 +1,9 @@ +Subnet = 10.7.7.111 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAuHQEeowvxRkoHJUw6cUp431pnoIy4MVv7kTLgWEK46nzgZtld9LM +ZdNMJB9CuOVVMHEaiY6Q5YchUmapGxwEObc0y+8zQxTPw3I4q0GkSJqKLPrsTpkn +sgEkHPfs2GVdtIBXDn9I8i5JsY2+U8QF8fbIQSOO08/Vpa3nknDAMege9yEa3NFm +s/+x+2pS+xV6uzf/H21XNv0oufInXwZH1NCNXAy5I2V6pz7BmAHilVOGCT7g2zn6 +GasmofiYEnro4V5s8gDlQkb7bCZEIA9EgX/HP6fZJQezSUHcDCQFI0vg26xywbr6 +5+9tTn8fN2mWS5+Pdmx3haX1qFcBP5HglwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/pa_sharepoint b/pa_sharepoint new file mode 100644 index 00000000..384a7c22 --- /dev/null +++ b/pa_sharepoint @@ -0,0 +1,7 @@ +Address = pa-sharepoint.informatik.ba-stuttgart.de +Subnet = 10.7.7.5 +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAKSle+5vi8j+auGIC41PwFRPdzuyhP/paAEht+9mWpTYYC1meyPDwQR8 +EPNLwj1ccjsAvhubfaDmI3B13cBQx5q1BbTCK81Y5RS1tj384kvAabJAtKsz3aIg +1hWXjiDJUGNpQhKsD7IIg4lkkDcgOBAbdtXlynCQXdQL+YjLTavBAgMBAAE= +-----END RSA PUBLIC KEY----- diff --git a/pfleidi b/pfleidi new file mode 100644 index 00000000..416658cf --- /dev/null +++ b/pfleidi @@ -0,0 +1,9 @@ +Subnet = 10.7.7.177 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwdoS19bbKmVncJcf+uT5nNpyuR8SL9ekd+XMoKBpoqDf0r7ap3F2 +HLNI82NSbSAA4zdASrfrDl75sJ05VIIsueNAwMkFc72YNA9CPBFGcvCNVi0d4XcC +t6voNrgCVaxT77MVBAnohT7+HfYmkTTSrLaDKusRx7ybz6ZaRO9i2peC2VWKVIjP +m3QlvPeTpIJg/nGEBNO3rotBPxpMEB+fJnWxfBHRlt9klK3VhLaXCLUt5KcJ2SA4 +q3BFQbptUfI+d6OSA9btJerdtZ3PVBqlIJ45b3RDUWMborVg6jQ7S4WBzARe1eKs +SHHk0aR5LoiSGiNVGTDlxLVe1UT1dF8voQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/pornocauster b/pornocauster new file mode 100644 index 00000000..eee28777 --- /dev/null +++ b/pornocauster @@ -0,0 +1,9 @@ +Subnet = 10.7.7.42 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAnztrijsfao+fmNtwAjqwIDKsRaMP3ECsq2T2zqKvxwCyXk69G9bG +RFhWjgaawS9ZhnHSlgWK/vtoR0O9NxpzdU/mvdQijbVGxM02DegjO9qDSIe8EGmA +kscW4nDqYtw4rtjOVPfnNiWXbcWD8eiYR0kcSWmSvfOpVvdhTETqduTx5HRHyEFD +JRQYR/tJSvVWXmM670PENAPNJFJ4VSJR60s5A+bFT7J/uw7HzJXX28LygJz73Dj2 +2a4ev0WcZQngLq072h/91R/TOpg+ogUDVhXkQtKyFj7im0287JTL4bXGofZBhzaf ++h9dFGs1QLoNyhG/cgt9fog7boSXTelAiQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/supernode b/supernode new file mode 100644 index 00000000..5cee4e32 --- /dev/null +++ b/supernode @@ -0,0 +1,10 @@ +Address = 46.252.21.5 +Subnet = 10.7.7.1 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP +sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj ++0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 +1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I +b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z +rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From e2ea255dcc1aace520156e4d0c8c3952b2e6147d Mon Sep 17 00:00:00 2001 From: root Date: Sun, 8 May 2011 14:56:54 +0200 Subject: initial commit --- supernode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supernode b/supernode index 5cee4e32..7e8d0fd8 100644 --- a/supernode +++ b/supernode @@ -1,4 +1,4 @@ -Address = 46.252.21.5 +Address = miefda.org Subnet = 10.7.7.1 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -- cgit v1.2.3 From 803afcaa13267e416e5a63e7cf25ddab483b995f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 9 May 2011 15:56:54 +0200 Subject: testing --- miefda901 | 1 + 1 file changed, 1 insertion(+) diff --git a/miefda901 b/miefda901 index a1b59a29..1fd4a063 100644 --- a/miefda901 +++ b/miefda901 @@ -7,3 +7,4 @@ vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQnvsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7h Bv6prIxCbpY7WMMtg0z+OlyGkQefVRl18kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnN VoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4nwIDAQAB -----END RSA PUBLIC KEY----- +#test -- cgit v1.2.3 From d295ededbcfc45f0403c658c136ea85a070452cb Mon Sep 17 00:00:00 2001 From: root Date: Mon, 9 May 2011 15:58:02 +0200 Subject: undone test settinundone test settingg --- miefda901 | 1 - 1 file changed, 1 deletion(-) diff --git a/miefda901 b/miefda901 index 1fd4a063..a1b59a29 100644 --- a/miefda901 +++ b/miefda901 @@ -7,4 +7,3 @@ vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQnvsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7h Bv6prIxCbpY7WMMtg0z+OlyGkQefVRl18kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnN VoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4nwIDAQAB -----END RSA PUBLIC KEY----- -#test -- cgit v1.2.3 From 92f4a21a6388b2d13db369dcd8895244dbb1087e Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Tue, 10 May 2011 13:42:00 +0200 Subject: added ITART,UTART,ytart --- hosts/ITART | 6 ++++++ hosts/UTART | 9 +++++++++ hosts/ytart | 9 +++++++++ 3 files changed, 24 insertions(+) create mode 100644 hosts/ITART create mode 100644 hosts/UTART create mode 100644 hosts/ytart diff --git a/hosts/ITART b/hosts/ITART new file mode 100644 index 00000000..953c0995 --- /dev/null +++ b/hosts/ITART @@ -0,0 +1,6 @@ +Subnet = 10.7.7.22 +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBANihbPlgirJ63MpMX283M+SjW6JgEhXmt1zcRuOyunbUq6Yt+w4sVtN8 +n2dZ960cTnAXkM1mvMhIcI5p6ZwfdorThJV2+F9eb+84x3GiDLTZ2eL0UefxOSLG +OILFFu5t4Y82MCreyHV4GZDrb2Sz0L1t6r8DmyU91MjXkYBLq5g/AgMBAAE= +-----END RSA PUBLIC KEY----- diff --git a/hosts/UTART b/hosts/UTART new file mode 100644 index 00000000..43cd213a --- /dev/null +++ b/hosts/UTART @@ -0,0 +1,9 @@ +Subnet = 10.7.7.66 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1tFgR6xxNZavtG44QEAEzKQixJqO9MuO5hUcklH87Sml+Mz+Ptz/ +r8Vhmvc1NhL0d8h1VJSrzjAyYuBR0LKSGRYxHby/M9AqBjUHUhDM83ogV/CbSifs +TlBcKuvPkGVALN6LYcPXjzKzBI7X1ictqts9K3CoCWgjRld63noczvNnwVdHNawX +ckQdjzxMAgwtJW0hWfDr1Uhq3sVEFnHLzFJuLsnc6gDzKvP/ETQ6KINv43B9UerS +HzFK3ntViohW4K/p6i4gBNxFfYnuNLqnY+O/hc0/fFdKE36eLD8ngPURo3/As6Le +KlPEMBwIIJQpS7GP4BIUK/qPE9J7McU6wQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/ytart b/hosts/ytart new file mode 100644 index 00000000..9f45cd2f --- /dev/null +++ b/hosts/ytart @@ -0,0 +1,9 @@ +Subnet = 10.7.7.201 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA2yCCN8nAPmZNL75Jr+FtfP5jmyuqg7IpgfW03L3s8Gg7NB1eTQAg +UFPh13cj4lZleZOl3Yus7yx4HxMO8tYCptqnRPyP+UXrxvL+kECS4J3rLzjH/eOM +0oAxuEe+DOa5R9Vj2bRtTouePlEvXDpgZZcDnedutRUYFGLNvkoWxu0RGqfQaJmd +7KtOk1NJn9efNqwpl6ejPj5A+ivh2T1vAMWherM60JTjjhNGiSP4so0WG8PlBPYc +GKnmMSQl0u5n10uTvLoVvnSfLj/QvL3d8abTrFV2lRqaCTJy+lxgkS1A5AnsTP1G +OBbm/Gk9hRuYy2iP6FQ65q64/JfoeoqpPwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 82fc2342eebe314af0e495787d28afb36d49587a Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 10 May 2011 16:37:49 +0200 Subject: UTART: initial commit --- UTART | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 UTART diff --git a/UTART b/UTART new file mode 100644 index 00000000..43cd213a --- /dev/null +++ b/UTART @@ -0,0 +1,9 @@ +Subnet = 10.7.7.66 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1tFgR6xxNZavtG44QEAEzKQixJqO9MuO5hUcklH87Sml+Mz+Ptz/ +r8Vhmvc1NhL0d8h1VJSrzjAyYuBR0LKSGRYxHby/M9AqBjUHUhDM83ogV/CbSifs +TlBcKuvPkGVALN6LYcPXjzKzBI7X1ictqts9K3CoCWgjRld63noczvNnwVdHNawX +ckQdjzxMAgwtJW0hWfDr1Uhq3sVEFnHLzFJuLsnc6gDzKvP/ETQ6KINv43B9UerS +HzFK3ntViohW4K/p6i4gBNxFfYnuNLqnY+O/hc0/fFdKE36eLD8ngPURo3/As6Le +KlPEMBwIIJQpS7GP4BIUK/qPE9J7McU6wQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 396fdae0ef44a35a7f1f0840a62c6a3d0d4403d1 Mon Sep 17 00:00:00 2001 From: miefda Date: Tue, 10 May 2011 19:37:54 +0200 Subject: added pubkeys --- .pubkeys/5eruun | 9 +++++++++ .pubkeys/Lassulus | 9 +++++++++ .pubkeys/alphalabs | 9 +++++++++ .pubkeys/miefda901 | 9 +++++++++ .pubkeys/miefdahome | 9 +++++++++ .pubkeys/miefdat | 9 +++++++++ 6 files changed, 54 insertions(+) create mode 100644 .pubkeys/5eruun create mode 100644 .pubkeys/Lassulus create mode 100644 .pubkeys/alphalabs create mode 100644 .pubkeys/miefda901 create mode 100644 .pubkeys/miefdahome create mode 100644 .pubkeys/miefdat diff --git a/.pubkeys/5eruun b/.pubkeys/5eruun new file mode 100644 index 00000000..ce24501f --- /dev/null +++ b/.pubkeys/5eruun @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/YOSX4xEKitiVzIP0xFU +KQvC01uKN+KCT2Y7H8MFzowB+GWdVvplRi8TukMF1EYlIZoSIrgPO/SoOFZNvxPa +83I6PeN6W830qKpUt3xYMqyuL2ZJw1hvhsgPWbGXF2yA39mQas9Skf2SNnEJppFp +N8mGw449PLhTFmGoR3x3354kgO40zts4qqvpMcyTOx+zQhnGBO4KQqftJU1klgCc +YUHrN+ql5vq3u6YgMpUIczPnhN6Cnm+jhys6sTXN/DFcpq6YGXTHSGZO1JTuAyfZ +HfXXgUtIbW5W03LLtkYcMIiaIafe+qivtAs3cZIEKZVp+1fdfypQok6nDPwC1jy8 +TwIDAQAB +-----END PUBLIC KEY----- diff --git a/.pubkeys/Lassulus b/.pubkeys/Lassulus new file mode 100644 index 00000000..b782f07f --- /dev/null +++ b/.pubkeys/Lassulus @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsj1PCibKOfF68gmFQ+ww +yfhUWpqKqpznrJX1dZ+daae7l7nBHvsEH0QwkiMmk3aZy1beq3quM6gX13aT+/wM +fWnLyuvT11T5C9JEf/IS91STpM2BRN+R+P/DhbuDcW4UsdEe6uwQDGEJbXRN5ZA7 +GI0bmcYcwHJ9SQmW5v7P9Z3oZ+09hMD+1cZ3HkPN7weSdMLMPpUpmzCsI92cXGW0 +xRC4iBEt1ZeBwjkLCRsBFBGcUMuKWwVa9sovca0q3DUar+kikEKVrVy26rZUlGuB +LobMetDGioSawWkRSxVlfZvTHjAK5JzUO6y6hj0yQ1sp6W2JjU8ntDHf63aM71dB +9QIDAQAB +-----END PUBLIC KEY----- diff --git a/.pubkeys/alphalabs b/.pubkeys/alphalabs new file mode 100644 index 00000000..d44083f9 --- /dev/null +++ b/.pubkeys/alphalabs @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvUAbMmmOFn+4kOvJAvmi +0R/XCQa1YBlkjUvC6Pmt0Q8gV1DodXjBDgwP8yhLcxaVy2Hk82aJvNTUrfMeB2sd +t1RJHQiEPQkHthdp8Spm0Px4uTiMjmFBev91xi00eCCGIKsXdh/qso1K7EDHt9ME +VHOvSlkawWzoyJ6AaHStW1ElwDdGjZpl0YWrhx4Gk5X7pCp3LKkQJFfGtqoqGOVg +2JjqK3qMsAdRo6QvYDqjFzARed/D0k55kcKXjBJAVxoU/CqGfS/Lr0fL8tdYgXaA +XvPO9dbr1t0KyOUY2KRNBePeSvRp/etbH0LBPsO9F7PQiPI3DBoWCYgsuj/hBXap +vwIDAQAB +-----END PUBLIC KEY----- diff --git a/.pubkeys/miefda901 b/.pubkeys/miefda901 new file mode 100644 index 00000000..740af30d --- /dev/null +++ b/.pubkeys/miefda901 @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApbEYmHf0vEDYa/2aVvWV +xEGgC+JJlXcArdxkQooSIpnZfSAfsH0SMFz8v7UkM7EJSwDsFWf+gxyoAORdFpdQ +m+XQoDqWVZ1e0isYtNluP2C/51s3lu2FkVLZ+86el7zd4unHG+6CHmyaBcO5yV6V +U8WFeuinB2+ojnujOWlHgOipMOrxsab8vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQn +vsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7hBv6prIxCbpY7WMMtg0z+OlyGkQefVRl1 +8kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnNVoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4 +nwIDAQAB +-----END PUBLIC KEY----- diff --git a/.pubkeys/miefdahome b/.pubkeys/miefdahome new file mode 100644 index 00000000..8e453787 --- /dev/null +++ b/.pubkeys/miefdahome @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAopwKn000XAcoI61OqQ7c +jgrPHm/jHmuB1LHeCUggWMOD78WDFNzq8/l9ASlU9kbSZFhoMuBR5BPWgciYWsC1 +EqY1nRAc/Si1rUHnJw+Xcyl0MNsZ7CefWaFRvC1VNC3qlQp5/e+fi46oOp4i+Bql +FSxe7Jrr0EVyBVTOw8rMGToqDsOih6M9SFvmVMOnqh7n8LEOUtAL4nID59k7CTXz +oNhXc0cEJoBkC2YCexonb4ru/J8F2BRGY3yzHYVskBrrPie1JNhfUHGCABIbtODT +iHQYH8NFTYzdBnVV88IWqiTBbmKcRf+jzEyGyXu/3YLFfjmsi7ysT+BWLIPvkyr7 +/wIDAQAB +-----END PUBLIC KEY----- diff --git a/.pubkeys/miefdat b/.pubkeys/miefdat new file mode 100644 index 00000000..07ffc57e --- /dev/null +++ b/.pubkeys/miefdat @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvCestFRcrr10nzSzc1l4 +Flkv6ZG5ijGneZBeDaP+bB3GhFx0BYzPCQjcCFTcExVVAorknjX1/rjT60+dSBuJ +oH/pEeloPowtwm6YVgfhcQD/5qRHmAPFSs1pdiTVtyi0BmcqDGoOTcR/tR4v2LBE +DnxK89wWIFWbeDeR6UyjD2psbFBal8ZdTmkuBTg1OGPVhB+BmuKSqPBt6AtLV+0f +KHdrTOVNwF2W/8lCVTd3uCVtnUEeTLrWKA8h9C0K2gAxxhJTF3pJtR/YQPpgwXRg +3CfzMKsvHNOsqfMnnk/WFM0vrSJSi2ElxCD5Pm/BPZyA8B4vhz8im4hWofOP2/Ji +NwIDAQAB +-----END PUBLIC KEY----- -- cgit v1.2.3 From 3764ed1dcf5d4036c346900c1f194bff58db9233 Mon Sep 17 00:00:00 2001 From: Lassulus Date: Tue, 10 May 2011 10:42:09 -0700 Subject: Edited supernode via GitHub --- supernode | 1 + 1 file changed, 1 insertion(+) diff --git a/supernode b/supernode index 7e8d0fd8..5d35ed24 100644 --- a/supernode +++ b/supernode @@ -1,3 +1,4 @@ +Address = 46.252.21.5 Address = miefda.org Subnet = 10.7.7.1 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From cd6e6705d3a3c2517141f111db68cfcda8a2b7fa Mon Sep 17 00:00:00 2001 From: miefda Date: Tue, 10 May 2011 19:44:14 +0200 Subject: added readme --- README | 1 + 1 file changed, 1 insertion(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 00000000..a7a4d885 --- /dev/null +++ b/README @@ -0,0 +1 @@ +README! -- cgit v1.2.3 From f8b128fd4debb1d8cdfddd5a8e64ffa0eb26abc9 Mon Sep 17 00:00:00 2001 From: Lassulus Date: Tue, 10 May 2011 10:46:21 -0700 Subject: Edited supernode via GitHub --- supernode | 1 - 1 file changed, 1 deletion(-) diff --git a/supernode b/supernode index 5d35ed24..7e8d0fd8 100644 --- a/supernode +++ b/supernode @@ -1,4 +1,3 @@ -Address = 46.252.21.5 Address = miefda.org Subnet = 10.7.7.1 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From a6a38725a97bfa0fe1942fe8f23aebc36177c3d7 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 May 2011 19:50:06 +0200 Subject: testnode --- testnode | 1 + 1 file changed, 1 insertion(+) create mode 100644 testnode diff --git a/testnode b/testnode new file mode 100644 index 00000000..77758c67 --- /dev/null +++ b/testnode @@ -0,0 +1 @@ +#nothin in here -- cgit v1.2.3 From fc4be5d34ac11323577c9f0b3e8eeab705e29e00 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 May 2011 19:52:28 +0200 Subject: removed testnode --- testnode | 1 - 1 file changed, 1 deletion(-) delete mode 100644 testnode diff --git a/testnode b/testnode deleted file mode 100644 index 77758c67..00000000 --- a/testnode +++ /dev/null @@ -1 +0,0 @@ -#nothin in here -- cgit v1.2.3 From 47e76beaf3e82a91588ca9c9f75909e3e9b97c60 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Tue, 10 May 2011 21:05:33 +0200 Subject: migrate to new repo layout README: added new clean install script description build_debian.sh: updated build_debian script (might still be broken) install.sh: updated script to work with new layout (untested) --- .scripts/README | 15 ++++++++++ .scripts/build_arch.sh | 14 +++++++++ .scripts/build_debian.sh | 18 +++++++++++ .scripts/build_debian_clean.sh | 31 +++++++++++++++++++ .scripts/build_ec2.sh | 16 ++++++++++ .scripts/build_no.de.sh | 1 + .scripts/install.sh | 68 ++++++++++++++++++++++++++++++++++++++++++ ITART | 6 ++++ Lassulus | 9 ++++++ README | 13 -------- UTART | 9 ++++++ alphalabs | 9 ++++++ also | 9 ++++++ build_arch.sh | 14 --------- build_debian.sh | 16 ---------- build_debian_clean.sh | 31 ------------------- build_ec2.sh | 16 ---------- build_no.de.sh | 1 - foobaz | 8 +++++ hosts/ITART | 6 ---- hosts/Lassulus | 9 ------ hosts/UTART | 9 ------ hosts/alphalabs | 9 ------ hosts/also | 9 ------ hosts/foobaz | 8 ----- hosts/kaah | 11 ------- hosts/krebs | 10 ------- hosts/miefda901 | 9 ------ hosts/miefdahome | 9 ------ hosts/miefdat | 10 ------- hosts/no_omo | 9 ------ hosts/pa_sharepoint | 7 ----- hosts/pfleidi | 9 ------ hosts/pornocauster | 9 ------ hosts/supernode | 10 ------- hosts/tart | 6 ---- hosts/ytart | 9 ------ install.sh | 68 ------------------------------------------ kaah | 11 +++++++ krebs | 10 +++++++ miefda901 | 9 ++++++ miefdahome | 9 ++++++ miefdat | 10 +++++++ no_omo | 9 ++++++ pa_sharepoint | 7 +++++ pfleidi | 9 ++++++ pornocauster | 9 ++++++ supernode | 10 +++++++ tart | 6 ++++ ytart | 9 ++++++ 50 files changed, 321 insertions(+), 317 deletions(-) create mode 100644 .scripts/README create mode 100755 .scripts/build_arch.sh create mode 100755 .scripts/build_debian.sh create mode 100755 .scripts/build_debian_clean.sh create mode 100755 .scripts/build_ec2.sh create mode 100644 .scripts/build_no.de.sh create mode 100755 .scripts/install.sh create mode 100644 ITART create mode 100644 Lassulus delete mode 100644 README create mode 100644 UTART create mode 100644 alphalabs create mode 100644 also delete mode 100755 build_arch.sh delete mode 100755 build_debian.sh delete mode 100755 build_debian_clean.sh delete mode 100755 build_ec2.sh delete mode 100644 build_no.de.sh create mode 100644 foobaz delete mode 100644 hosts/ITART delete mode 100644 hosts/Lassulus delete mode 100644 hosts/UTART delete mode 100644 hosts/alphalabs delete mode 100644 hosts/also delete mode 100644 hosts/foobaz delete mode 100644 hosts/kaah delete mode 100644 hosts/krebs delete mode 100644 hosts/miefda901 delete mode 100644 hosts/miefdahome delete mode 100644 hosts/miefdat delete mode 100644 hosts/no_omo delete mode 100644 hosts/pa_sharepoint delete mode 100644 hosts/pfleidi delete mode 100644 hosts/pornocauster delete mode 100644 hosts/supernode delete mode 100644 hosts/tart delete mode 100644 hosts/ytart delete mode 100755 install.sh create mode 100644 kaah create mode 100644 krebs create mode 100644 miefda901 create mode 100644 miefdahome create mode 100644 miefdat create mode 100644 no_omo create mode 100644 pa_sharepoint create mode 100644 pfleidi create mode 100644 pornocauster create mode 100644 supernode create mode 100644 tart create mode 100644 ytart diff --git a/.scripts/README b/.scripts/README new file mode 100644 index 00000000..8d104179 --- /dev/null +++ b/.scripts/README @@ -0,0 +1,15 @@ +This directory contains the build and install scripts for shack-retiolum + +1. build_arch + arch linux build script +2. build_debian + debian build script +3. build_debian_clean + debian script which builds a clean tinc daemon +4. build_ec2 + Amazon ec2 base instance build script +5. install.sh + configures the tinc daemon + $1 is the nickname + $2 is the ip-address +hosts.tar contains the currently available hosts diff --git a/.scripts/build_arch.sh b/.scripts/build_arch.sh new file mode 100755 index 00000000..5ef5d765 --- /dev/null +++ b/.scripts/build_arch.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +sudo pacman -S openssl gcc lzo +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install +cd .. + +echo "overwriting python to python2" +sed 's/\/usr\/bin\/python/\/usr\/bin\/python2/g' install.sh >install2.sh +mv install2.sh install.sh + diff --git a/.scripts/build_debian.sh b/.scripts/build_debian.sh new file mode 100755 index 00000000..d8fcec2f --- /dev/null +++ b/.scripts/build_debian.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -x +MYIP=10.0.7.7.55 + +apt-get install tinc git curl python + +git clone https://github.com/makefu/shack-retiolum.git + +cd shack-retiolum + +./install.sh `hostname` $MYIP +cd .. +rm shack-retiolum +# for autostart +sed -i '/retiolum/d' /etc/tinc/nets.boot +echo "retiolum" >> /etc/tinc/nets.boot +sed -i '/EXTRA/d' /etc/tinc/nets.boot +echo "EXTRA=\"\"" >> /etc/default/tinc diff --git a/.scripts/build_debian_clean.sh b/.scripts/build_debian_clean.sh new file mode 100755 index 00000000..a7332f4e --- /dev/null +++ b/.scripts/build_debian_clean.sh @@ -0,0 +1,31 @@ +#!/bin/bash +set -xe +MYIP=10.0.7.7.55 + +apt-get install tinc git curl gcc gcc-dev build-essential libssl-dev python + +git clone https://github.com/makefu/shack-retiolum.git + +mkdir build +cd build +curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar +xz +cd lzo-2.04 +./configure --prefix=/usr +make +sudo make install +cd .. +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install +cd ../.. + +cd shack-retiolum +./install.sh `hostname` $MYIP + +rm shack-retiolum +# for autostart +echo "retiolum" >> /etc/tinc/nets.boot +echo "EXTRA=\"--user=tincd --chroot\"" >> /etc/default/tinc diff --git a/.scripts/build_ec2.sh b/.scripts/build_ec2.sh new file mode 100755 index 00000000..79f2af28 --- /dev/null +++ b/.scripts/build_ec2.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -e +sudo yum install -y gcc openssl-devel +mkdir build +cd build +curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar xz +cd lzo-2.04 +./configure --prefix=/usr +make +sudo make install +cd .. +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install diff --git a/.scripts/build_no.de.sh b/.scripts/build_no.de.sh new file mode 100644 index 00000000..2976d3a2 --- /dev/null +++ b/.scripts/build_no.de.sh @@ -0,0 +1 @@ +pkgin in lzo gcc-tools gcc-compiler gcc34 diff --git a/.scripts/install.sh b/.scripts/install.sh new file mode 100755 index 00000000..4b21bcd4 --- /dev/null +++ b/.scripts/install.sh @@ -0,0 +1,68 @@ +#! /bin/sh +# USE WITH GREAT CAUTION + +set -e +myname="${1:-dummy}" +rel_hostsfile=`dirname $0`/.. +hostsfile=`readlink -f $rel_hostsfile` +netname=retiolum +myipv4="${2:-10.7.7.56}" +mynet4=10.7.7.0 +CURR=`pwd` +# create configuration directory for $netname +mkdir -p /etc/tinc/$netname +cd /etc/tinc/$netname + +# get currently known hosts +cp -r $hostsfile hosts +echo "added known hosts:" +ls -1 | LC_ALL=C sort +echo "delete the nodes you do not trust!" + + +cat>tinc-up<tinc.conf< hosts/$myname +tincd -n $netname -K + +echo Writing Public Key to irc channel +cat>write_channel.py<install2.sh -mv install2.sh install.sh - diff --git a/build_debian.sh b/build_debian.sh deleted file mode 100755 index 3f21ec6e..00000000 --- a/build_debian.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -x -MYIP=10.0.7.7.55 - -apt-get install tinc git curl python - -git clone https://github.com/makefu/shack-retiolum.git - -cd shack-retiolum - -./install.sh `hostname` $MYIP - -rm shack-retiolum -# for autostart -echo "retiolum" >> /etc/tinc/nets.boot -echo "EXTRA=\"\"" >> /etc/default/tinc diff --git a/build_debian_clean.sh b/build_debian_clean.sh deleted file mode 100755 index a7332f4e..00000000 --- a/build_debian_clean.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -set -xe -MYIP=10.0.7.7.55 - -apt-get install tinc git curl gcc gcc-dev build-essential libssl-dev python - -git clone https://github.com/makefu/shack-retiolum.git - -mkdir build -cd build -curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar -xz -cd lzo-2.04 -./configure --prefix=/usr -make -sudo make install -cd .. -curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz -cd tinc-1.0.13 -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -make -sudo make install -cd ../.. - -cd shack-retiolum -./install.sh `hostname` $MYIP - -rm shack-retiolum -# for autostart -echo "retiolum" >> /etc/tinc/nets.boot -echo "EXTRA=\"--user=tincd --chroot\"" >> /etc/default/tinc diff --git a/build_ec2.sh b/build_ec2.sh deleted file mode 100755 index 79f2af28..00000000 --- a/build_ec2.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -e -sudo yum install -y gcc openssl-devel -mkdir build -cd build -curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar xz -cd lzo-2.04 -./configure --prefix=/usr -make -sudo make install -cd .. -curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz -cd tinc-1.0.13 -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -make -sudo make install diff --git a/build_no.de.sh b/build_no.de.sh deleted file mode 100644 index 2976d3a2..00000000 --- a/build_no.de.sh +++ /dev/null @@ -1 +0,0 @@ -pkgin in lzo gcc-tools gcc-compiler gcc34 diff --git a/foobaz b/foobaz new file mode 100644 index 00000000..47ac4d6e --- /dev/null +++ b/foobaz @@ -0,0 +1,8 @@ +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA4wJHcyS3PI2rugPbhQy5qLKQwtaOIsLV367b9Pq6VLKEly2dWAZx +xvFmdKRbm/n/HaRzX+vyDuhWOxkzrF0NLNrrU58Rw5suHfNU2ryuO1QB2sIGMj1R +QXwB+W6MNM5OamBkLLo740aPvVjfud9tc3yrUg6mTCJP1tbRLgHyDy6DT3s5WGvO +R6bfYRjdzVLjwqqn5P/ED51gBgDmJEhoWzQ4IzBSO+mxRrkvwfPQNiTSrrQBAiU7 +r5lstDzEY8qDdwY6t1w91hxm34LLJ/gQr9uvXGF/GThm4J8Ndlj4tOl8UmFbo3Nz +6Zm0b2JZ4dWbA/NXp7Sf9qKC5duQkAPb1QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/ITART b/hosts/ITART deleted file mode 100644 index 953c0995..00000000 --- a/hosts/ITART +++ /dev/null @@ -1,6 +0,0 @@ -Subnet = 10.7.7.22 ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBANihbPlgirJ63MpMX283M+SjW6JgEhXmt1zcRuOyunbUq6Yt+w4sVtN8 -n2dZ960cTnAXkM1mvMhIcI5p6ZwfdorThJV2+F9eb+84x3GiDLTZ2eL0UefxOSLG -OILFFu5t4Y82MCreyHV4GZDrb2Sz0L1t6r8DmyU91MjXkYBLq5g/AgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/hosts/Lassulus b/hosts/Lassulus deleted file mode 100644 index 61c2d62b..00000000 --- a/hosts/Lassulus +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.11 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE -H0QwkiMmk3aZy1beq3quM6gX13aT+/wMfWnLyuvT11T5C9JEf/IS91STpM2BRN+R -+P/DhbuDcW4UsdEe6uwQDGEJbXRN5ZA7GI0bmcYcwHJ9SQmW5v7P9Z3oZ+09hMD+ -1cZ3HkPN7weSdMLMPpUpmzCsI92cXGW0xRC4iBEt1ZeBwjkLCRsBFBGcUMuKWwVa -9sovca0q3DUar+kikEKVrVy26rZUlGuBLobMetDGioSawWkRSxVlfZvTHjAK5JzU -O6y6hj0yQ1sp6W2JjU8ntDHf63aM71dB9QIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/UTART b/hosts/UTART deleted file mode 100644 index 43cd213a..00000000 --- a/hosts/UTART +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.66 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA1tFgR6xxNZavtG44QEAEzKQixJqO9MuO5hUcklH87Sml+Mz+Ptz/ -r8Vhmvc1NhL0d8h1VJSrzjAyYuBR0LKSGRYxHby/M9AqBjUHUhDM83ogV/CbSifs -TlBcKuvPkGVALN6LYcPXjzKzBI7X1ictqts9K3CoCWgjRld63noczvNnwVdHNawX -ckQdjzxMAgwtJW0hWfDr1Uhq3sVEFnHLzFJuLsnc6gDzKvP/ETQ6KINv43B9UerS -HzFK3ntViohW4K/p6i4gBNxFfYnuNLqnY+O/hc0/fFdKE36eLD8ngPURo3/As6Le -KlPEMBwIIJQpS7GP4BIUK/qPE9J7McU6wQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/alphalabs b/hosts/alphalabs deleted file mode 100644 index 6aea1dec..00000000 --- a/hosts/alphalabs +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.10 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAvUAbMmmOFn+4kOvJAvmi0R/XCQa1YBlkjUvC6Pmt0Q8gV1DodXjB -DgwP8yhLcxaVy2Hk82aJvNTUrfMeB2sdt1RJHQiEPQkHthdp8Spm0Px4uTiMjmFB -ev91xi00eCCGIKsXdh/qso1K7EDHt9MEVHOvSlkawWzoyJ6AaHStW1ElwDdGjZpl -0YWrhx4Gk5X7pCp3LKkQJFfGtqoqGOVg2JjqK3qMsAdRo6QvYDqjFzARed/D0k55 -kcKXjBJAVxoU/CqGfS/Lr0fL8tdYgXaAXvPO9dbr1t0KyOUY2KRNBePeSvRp/etb -H0LBPsO9F7PQiPI3DBoWCYgsuj/hBXapvwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/also b/hosts/also deleted file mode 100644 index 9f9dcd73..00000000 --- a/hosts/also +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.23 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry -Euy3v3s0ps/GMdE52gUbFB+bhM99hHiKW+7zcxnoMJ69a9yK6VG0Im+7ib0WTliZ -llgUfRETQd/2KaIfJWH/nVsBuK0hp1LscroWcoO08BCw6v94q3He8502Bk/ZYZQF -wD7Y6LldipWKo/K9YtIU3zD3taj2NGnetOc0BRRncSgGiicXJKhtfcs+Ti2Y/ITz -bFkHnFgB0KnhjwJBumxdmgjHWknlwVkROvmzIgyoXxqEw31bF+g/XzA7RTMXsiFM -w0SZ15k4HG5L1PWpUyY2Th5yIjMW+sSrhQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/foobaz b/hosts/foobaz deleted file mode 100644 index 47ac4d6e..00000000 --- a/hosts/foobaz +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA4wJHcyS3PI2rugPbhQy5qLKQwtaOIsLV367b9Pq6VLKEly2dWAZx -xvFmdKRbm/n/HaRzX+vyDuhWOxkzrF0NLNrrU58Rw5suHfNU2ryuO1QB2sIGMj1R -QXwB+W6MNM5OamBkLLo740aPvVjfud9tc3yrUg6mTCJP1tbRLgHyDy6DT3s5WGvO -R6bfYRjdzVLjwqqn5P/ED51gBgDmJEhoWzQ4IzBSO+mxRrkvwfPQNiTSrrQBAiU7 -r5lstDzEY8qDdwY6t1w91hxm34LLJ/gQr9uvXGF/GThm4J8Ndlj4tOl8UmFbo3Nz -6Zm0b2JZ4dWbA/NXp7Sf9qKC5duQkAPb1QIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/kaah b/hosts/kaah deleted file mode 100644 index d56014fa..00000000 --- a/hosts/kaah +++ /dev/null @@ -1,11 +0,0 @@ -Address = kaah.ath.cx -Subnet = 10.7.7.21 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAtd9+R7NYs/5LmXoFakuoFzdO/8hy4MMeGjdDqbubKyJmIO/nvQWS -TQns55znLgPIapUtCijxphoQrcTB5LijVXFj/2uipqiOJHVmhA80NiQgYhrFG++x -9AQie2c04xqq+6Bptjs8vnQS6odLsBAiY1OJDpaEPZqzrpSMnYzEwPWqOAzzbVRd -SFDokIhm62xmDK0+M4H8l3zmMnInnxdHd0fMhBJr5lXXqdzXJ3zluU6fZyHysF4c -OnvFrGNrc3MPpgmzULVUUVg+Z4NeQYa5LuhXA9xia0R5d8ALCi34L4tAvCfSi1Lu -RSUiJHeWDvNzwIy9+hxofqqcJqA05kyGLQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/krebs b/hosts/krebs deleted file mode 100644 index 4aba5105..00000000 --- a/hosts/krebs +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 10.7.7.156 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAl6vUmUL8w8r2gUTpUF8QWx0U3nzDPao2I7l0WU1NnGcR8DVug7YN -595guvDkRGcM4eYGizgVYVvDCmjTQRXRn57ucVud2bGE1NGtdomVs6wggpgzLiaf -m9BJwsigoCyMv+8ewGfc+D10TupulcIiZSp/RAewYlX0rhmgdsEGnCt+TWvXRsIa -kY1pvt4YeKjs2ctib3OmaPuNokK4ophxSpdZ5arjHCaiVMj2O6pPAQbU7WFY63Fw -UP64cAmtqBM+uMteT7bdG1jT3KZS6W7Dy8rIBd+pp+vB656A5PhrDcGEUMFSXqPD -BwIxhV7OAejSn4XjrZyd5eNtMOQKopIMQwIDAQAB ------END RSA PUBLIC KEY----- - diff --git a/hosts/miefda901 b/hosts/miefda901 deleted file mode 100644 index a1b59a29..00000000 --- a/hosts/miefda901 +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.22 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEApbEYmHf0vEDYa/2aVvWVxEGgC+JJlXcArdxkQooSIpnZfSAfsH0S -MFz8v7UkM7EJSwDsFWf+gxyoAORdFpdQm+XQoDqWVZ1e0isYtNluP2C/51s3lu2F -kVLZ+86el7zd4unHG+6CHmyaBcO5yV6VU8WFeuinB2+ojnujOWlHgOipMOrxsab8 -vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQnvsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7h -Bv6prIxCbpY7WMMtg0z+OlyGkQefVRl18kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnN -VoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4nwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/miefdahome b/hosts/miefdahome deleted file mode 100644 index 9a9f4310..00000000 --- a/hosts/miefdahome +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.30 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAopwKn000XAcoI61OqQ7cjgrPHm/jHmuB1LHeCUggWMOD78WDFNzq -8/l9ASlU9kbSZFhoMuBR5BPWgciYWsC1EqY1nRAc/Si1rUHnJw+Xcyl0MNsZ7Cef -WaFRvC1VNC3qlQp5/e+fi46oOp4i+BqlFSxe7Jrr0EVyBVTOw8rMGToqDsOih6M9 -SFvmVMOnqh7n8LEOUtAL4nID59k7CTXzoNhXc0cEJoBkC2YCexonb4ru/J8F2BRG -Y3yzHYVskBrrPie1JNhfUHGCABIbtODTiHQYH8NFTYzdBnVV88IWqiTBbmKcRf+j -zEyGyXu/3YLFfjmsi7ysT+BWLIPvkyr7/wIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/miefdat b/hosts/miefdat deleted file mode 100644 index 43e2a6e6..00000000 --- a/hosts/miefdat +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 10.7.7.20 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAvCestFRcrr10nzSzc1l4Flkv6ZG5ijGneZBeDaP+bB3GhFx0BYzP -CQjcCFTcExVVAorknjX1/rjT60+dSBuJoH/pEeloPowtwm6YVgfhcQD/5qRHmAPF -Ss1pdiTVtyi0BmcqDGoOTcR/tR4v2LBEDnxK89wWIFWbeDeR6UyjD2psbFBal8Zd -TmkuBTg1OGPVhB+BmuKSqPBt6AtLV+0fKHdrTOVNwF2W/8lCVTd3uCVtnUEeTLrW -KA8h9C0K2gAxxhJTF3pJtR/YQPpgwXRg3CfzMKsvHNOsqfMnnk/WFM0vrSJSi2El -xCD5Pm/BPZyA8B4vhz8im4hWofOP2/JiNwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/no_omo b/hosts/no_omo deleted file mode 100644 index f2398f18..00000000 --- a/hosts/no_omo +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.111 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAuHQEeowvxRkoHJUw6cUp431pnoIy4MVv7kTLgWEK46nzgZtld9LM -ZdNMJB9CuOVVMHEaiY6Q5YchUmapGxwEObc0y+8zQxTPw3I4q0GkSJqKLPrsTpkn -sgEkHPfs2GVdtIBXDn9I8i5JsY2+U8QF8fbIQSOO08/Vpa3nknDAMege9yEa3NFm -s/+x+2pS+xV6uzf/H21XNv0oufInXwZH1NCNXAy5I2V6pz7BmAHilVOGCT7g2zn6 -GasmofiYEnro4V5s8gDlQkb7bCZEIA9EgX/HP6fZJQezSUHcDCQFI0vg26xywbr6 -5+9tTn8fN2mWS5+Pdmx3haX1qFcBP5HglwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/pa_sharepoint b/hosts/pa_sharepoint deleted file mode 100644 index 384a7c22..00000000 --- a/hosts/pa_sharepoint +++ /dev/null @@ -1,7 +0,0 @@ -Address = pa-sharepoint.informatik.ba-stuttgart.de -Subnet = 10.7.7.5 ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAKSle+5vi8j+auGIC41PwFRPdzuyhP/paAEht+9mWpTYYC1meyPDwQR8 -EPNLwj1ccjsAvhubfaDmI3B13cBQx5q1BbTCK81Y5RS1tj384kvAabJAtKsz3aIg -1hWXjiDJUGNpQhKsD7IIg4lkkDcgOBAbdtXlynCQXdQL+YjLTavBAgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/hosts/pfleidi b/hosts/pfleidi deleted file mode 100644 index 416658cf..00000000 --- a/hosts/pfleidi +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.177 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAwdoS19bbKmVncJcf+uT5nNpyuR8SL9ekd+XMoKBpoqDf0r7ap3F2 -HLNI82NSbSAA4zdASrfrDl75sJ05VIIsueNAwMkFc72YNA9CPBFGcvCNVi0d4XcC -t6voNrgCVaxT77MVBAnohT7+HfYmkTTSrLaDKusRx7ybz6ZaRO9i2peC2VWKVIjP -m3QlvPeTpIJg/nGEBNO3rotBPxpMEB+fJnWxfBHRlt9klK3VhLaXCLUt5KcJ2SA4 -q3BFQbptUfI+d6OSA9btJerdtZ3PVBqlIJ45b3RDUWMborVg6jQ7S4WBzARe1eKs -SHHk0aR5LoiSGiNVGTDlxLVe1UT1dF8voQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/pornocauster b/hosts/pornocauster deleted file mode 100644 index eee28777..00000000 --- a/hosts/pornocauster +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.42 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAnztrijsfao+fmNtwAjqwIDKsRaMP3ECsq2T2zqKvxwCyXk69G9bG -RFhWjgaawS9ZhnHSlgWK/vtoR0O9NxpzdU/mvdQijbVGxM02DegjO9qDSIe8EGmA -kscW4nDqYtw4rtjOVPfnNiWXbcWD8eiYR0kcSWmSvfOpVvdhTETqduTx5HRHyEFD -JRQYR/tJSvVWXmM670PENAPNJFJ4VSJR60s5A+bFT7J/uw7HzJXX28LygJz73Dj2 -2a4ev0WcZQngLq072h/91R/TOpg+ogUDVhXkQtKyFj7im0287JTL4bXGofZBhzaf -+h9dFGs1QLoNyhG/cgt9fog7boSXTelAiQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/supernode b/hosts/supernode deleted file mode 100644 index 5cee4e32..00000000 --- a/hosts/supernode +++ /dev/null @@ -1,10 +0,0 @@ -Address = 46.252.21.5 -Subnet = 10.7.7.1 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj -+0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 -1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I -b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z -rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/hosts/tart b/hosts/tart deleted file mode 100644 index 986140ee..00000000 --- a/hosts/tart +++ /dev/null @@ -1,6 +0,0 @@ -Subnet = 10.7.7.123 ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBALvZ4rLz0soCzkyOraC1aKtJzfVqYd2je6rkuaV12CLybCUc6YXaW/HP -rzJyDGmdh355kU4FNNyjnWP/U/juhMaeYFyTUWCRVXdqvDdeiEe/EJ0g+fFGKvPY -DEFo3VMCEkrXKuwDBQP02b4xmAWWnVBityGv5tgDFjl9uXh/SzL1AgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/hosts/ytart b/hosts/ytart deleted file mode 100644 index 9f45cd2f..00000000 --- a/hosts/ytart +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.7.7.201 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA2yCCN8nAPmZNL75Jr+FtfP5jmyuqg7IpgfW03L3s8Gg7NB1eTQAg -UFPh13cj4lZleZOl3Yus7yx4HxMO8tYCptqnRPyP+UXrxvL+kECS4J3rLzjH/eOM -0oAxuEe+DOa5R9Vj2bRtTouePlEvXDpgZZcDnedutRUYFGLNvkoWxu0RGqfQaJmd -7KtOk1NJn9efNqwpl6ejPj5A+ivh2T1vAMWherM60JTjjhNGiSP4so0WG8PlBPYc -GKnmMSQl0u5n10uTvLoVvnSfLj/QvL3d8abTrFV2lRqaCTJy+lxgkS1A5AnsTP1G -OBbm/Gk9hRuYy2iP6FQ65q64/JfoeoqpPwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/install.sh b/install.sh deleted file mode 100755 index af461a30..00000000 --- a/install.sh +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh -# USE WITH GREAT CAUTION - -set -e -myname="${1:-dummy}" -rel_hostsfile=`dirname $0`/hosts -hostsfile=`readlink -f $rel_hostsfile` -netname=retiolum -myipv4="${2:-10.7.7.56}" -mynet4=10.7.7.0 -CURR=`pwd` -# create configuration directory for $netname -mkdir -p /etc/tinc/$netname -cd /etc/tinc/$netname - -# get currently known hosts -cp -r $hostsfile . -echo "added known hosts:" -ls -1 | LC_ALL=C sort -echo "delete the nodes you do not trust!" - - -cat>tinc-up<tinc.conf< hosts/$myname -tincd -n $netname -K - -echo Writing Public Key to irc channel -cat>write_channel.py< Date: Tue, 10 May 2011 21:26:36 +0200 Subject: editet README (test) --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index a7a4d885..eb610755 100644 --- a/README +++ b/README @@ -1 +1 @@ -README! +Readme is obsolete -- cgit v1.2.3 From 367d181db0e77ae6afb1a85706c64ddd40d14deb Mon Sep 17 00:00:00 2001 From: Lassulus Date: Tue, 10 May 2011 21:31:39 +0200 Subject: delteted dead nodes --- foobaz | 8 -------- tart | 6 ------ 2 files changed, 14 deletions(-) delete mode 100644 foobaz delete mode 100644 tart diff --git a/foobaz b/foobaz deleted file mode 100644 index 47ac4d6e..00000000 --- a/foobaz +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA4wJHcyS3PI2rugPbhQy5qLKQwtaOIsLV367b9Pq6VLKEly2dWAZx -xvFmdKRbm/n/HaRzX+vyDuhWOxkzrF0NLNrrU58Rw5suHfNU2ryuO1QB2sIGMj1R -QXwB+W6MNM5OamBkLLo740aPvVjfud9tc3yrUg6mTCJP1tbRLgHyDy6DT3s5WGvO -R6bfYRjdzVLjwqqn5P/ED51gBgDmJEhoWzQ4IzBSO+mxRrkvwfPQNiTSrrQBAiU7 -r5lstDzEY8qDdwY6t1w91hxm34LLJ/gQr9uvXGF/GThm4J8Ndlj4tOl8UmFbo3Nz -6Zm0b2JZ4dWbA/NXp7Sf9qKC5duQkAPb1QIDAQAB ------END RSA PUBLIC KEY----- diff --git a/tart b/tart deleted file mode 100644 index 986140ee..00000000 --- a/tart +++ /dev/null @@ -1,6 +0,0 @@ -Subnet = 10.7.7.123 ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBALvZ4rLz0soCzkyOraC1aKtJzfVqYd2je6rkuaV12CLybCUc6YXaW/HP -rzJyDGmdh355kU4FNNyjnWP/U/juhMaeYFyTUWCRVXdqvDdeiEe/EJ0g+fFGKvPY -DEFo3VMCEkrXKuwDBQP02b4xmAWWnVBityGv5tgDFjl9uXh/SzL1AgMBAAE= ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From 9ed88a16092880834761d9958f462090b46f0ae7 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 May 2011 22:37:29 +0200 Subject: deleted fucking README node xD --- README | 1 - 1 file changed, 1 deletion(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index eb610755..00000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -Readme is obsolete -- cgit v1.2.3 From 4269c70c103033147da1184c74704a1becb96957 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Tue, 10 May 2011 23:26:32 +0200 Subject: added own pubkey generated by openssl --- .pubkeys/pornocauster | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .pubkeys/pornocauster diff --git a/.pubkeys/pornocauster b/.pubkeys/pornocauster new file mode 100644 index 00000000..18e45a73 --- /dev/null +++ b/.pubkeys/pornocauster @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnztrijsfao+fmNtwAjqw +IDKsRaMP3ECsq2T2zqKvxwCyXk69G9bGRFhWjgaawS9ZhnHSlgWK/vtoR0O9Nxpz +dU/mvdQijbVGxM02DegjO9qDSIe8EGmAkscW4nDqYtw4rtjOVPfnNiWXbcWD8eiY +R0kcSWmSvfOpVvdhTETqduTx5HRHyEFDJRQYR/tJSvVWXmM670PENAPNJFJ4VSJR +60s5A+bFT7J/uw7HzJXX28LygJz73Dj22a4ev0WcZQngLq072h/91R/TOpg+ogUD +VhXkQtKyFj7im0287JTL4bXGofZBhzaf+h9dFGs1QLoNyhG/cgt9fog7boSXTelA +iQIDAQAB +-----END PUBLIC KEY----- -- cgit v1.2.3 From ca74a85f1d031377f9269e7a541a6c8f1cbefb3a Mon Sep 17 00:00:00 2001 From: Lassulus Date: Tue, 10 May 2011 23:29:45 +0200 Subject: added datamgmt and retiolum --- .scripts/datamgmt.py | 101 +++++++++++++++++ .scripts/retiolum.py | 312 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 413 insertions(+) create mode 100755 .scripts/datamgmt.py create mode 100755 .scripts/retiolum.py diff --git a/.scripts/datamgmt.py b/.scripts/datamgmt.py new file mode 100755 index 00000000..0d8f056d --- /dev/null +++ b/.scripts/datamgmt.py @@ -0,0 +1,101 @@ +#!/usr/bin/python2 +import sqlite3 +import os, sys + +def create_db(netname): + conn = sqlite3.connect("/etc/tinc/"+ netname + "/hosts.sqlite") + db = conn.cursor() + db.execute('''create table hosts(hostname text, subnet text, address text, port text, r_pub text, t_pub text)''') + conn.commit() + db.close() + +def PubInDb(netname, hostname): + pubfile = open("/etc/tinc/" + netname + "/hosts/.pubkeys/" + hostname, "r") + publines = pubfile.readlines() + pubfile.close() + pubkey = "" + for i in range(len(publines)): + pubkey += publines[i] + print(pubkey) + conn = sqlite3.connect("/etc/tinc/" + netname + "/hosts.sqlite") + c = conn.cursor() + tupel = [pubkey, hostname] + c.execute('UPDATE hosts SET r_pub=? WHERE hostname=?', tupel) + conn.commit() + c.close() + +def HostInDb(netname, hostname): + hostFile = open("/etc/tinc/"+ netname + "/hosts/" + hostname, "r") + hostlines = hostFile.readlines() + hostFile.close() + conn = sqlite3.connect("/etc/tinc/"+ netname + "/hosts.sqlite") + db = conn.cursor() + + lines = 0 + Subnet = "" + Tinc_pub_key = "" + Address = "#Address = none\n" + Port = "Port = 655\n" + while lines < len(hostlines): + if hostlines[lines][0:4] == "Addr": + Address = hostlines[lines] + print Address + if hostlines[lines][0:4] == "Subn": + Subnet = hostlines[lines] + print Subnet + if hostlines[lines][0:4] == "Port": + Port = hostlines[lines] + print Port + if hostlines[lines][0:10] == "-----BEGIN": + Tinc_pub_key_array = hostlines[lines:lines+8] + line = 0 + Tinc_pub_key = "" + while line < len(Tinc_pub_key_array): + Tinc_pub_key += Tinc_pub_key_array[line] + line += 1 + print Tinc_pub_key + lines += 1 + if not(Subnet == "" or Tinc_pub_key == ""): + tupel = (hostname, Subnet, Address, Port, Tinc_pub_key ) + conn = sqlite3.connect("/etc/tinc/"+ netname + "/hosts.sqlite") + db = conn.cursor() + db.execute('insert into hosts values(?,?,?,?,"none",?)', tupel) + conn.commit() + db.close() + +def ShowDb(netname): + conn = sqlite3.connect("/etc/tinc/" + netname + "/hosts.sqlite") + db = conn.cursor() + db.execute("select * from hosts") + for hosts in db: + for i in range(len(hosts)): + print hosts[i] + db.close + +def DirInDb(netname): + #the normal tinc files are read into the sqlite + files = os.listdir("/etc/tinc/" + netname + "/hosts/") + file_n = 0 + while file_n < len(files): + if files[file_n][0] == ".": + files.remove(files[file_n]) + file_n -= 1 + file_n += 1 + for filename in files: + HostInDb(netname, filename) + #the pubkeys are included into the sqlite + pubfiles = os.listdir("/etc/tinc/" + netname + "/hosts/.pubkeys/") + for pubname in pubfiles: + PubInDb(netname, pubname) + + +#Program start here +netname = sys.argv[1] + +try: + os.remove("/etc/tinc/" + netname + "/hosts.sqlite") +except: + print("no hosts.sqlite found") + +create_db(netname) +DirInDb(netname) diff --git a/.scripts/retiolum.py b/.scripts/retiolum.py new file mode 100755 index 00000000..99da7aae --- /dev/null +++ b/.scripts/retiolum.py @@ -0,0 +1,312 @@ +#!/usr/bin/python2 +import sys, os, time, socket, subprocess, thread, random, Queue, binascii, logging #these should all be in the stdlib +import sqlite3 +from Crypto.PublicKey import RSA +from optparse import OptionParser + +def pub_encrypt(netname, hostname_t, text): #encrypt data with public key + conn = sqlite3.connect("/etc/tinc/" + netname + "/hosts.sqlite") + c = conn.cursor() + hostname_tupel = [hostname_t] + pubkey = "" + try: