diff options
Diffstat (limited to 'retiolum')
49 files changed, 30 insertions, 61 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile index 8301c926..e0268c35 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -24,7 +24,6 @@ update: hosts sudo bin/restart-tincd; \ else \ sudo pkill -HUP tincd || :; \ - sudo pkill -ALRM tincd || :; \ fi arch-install: update install arch-autostart autohosts diff --git a/retiolum/bin/hosts b/retiolum/bin/hosts index bd0c77dc..4856d494 100755 --- a/retiolum/bin/hosts +++ b/retiolum/bin/hosts @@ -7,7 +7,7 @@ cd /etc/tinc/$netname/hosts for i in `ls`; do sed -n ' - s|^ *Subnet *= *\([^ /]*\)\(/[0-9]*\)\? *$|\1\t'$i' '$i'.'$netname'|p + s|^ *Subnet *= *\([^ /]*\)\(/[0-9]*\)\? *$|\1\t'$i'.'$netname' '$i'|p ' $i done | sort diff --git a/retiolum/hosts/Lassulus b/retiolum/hosts/Lassulus index 8662c063..594d1203 100644 --- a/retiolum/hosts/Lassulus +++ b/retiolum/hosts/Lassulus @@ -1,4 +1,3 @@ -Subnet = 10.7.7.11 Subnet = 42:0:0:0:0:0:0:dea7/128 Subnet = 42.251.103.67/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/Shepherd b/retiolum/hosts/Shepherd index 90f16ad6..b47bf815 100644 --- a/retiolum/hosts/Shepherd +++ b/retiolum/hosts/Shepherd @@ -1,4 +1,3 @@ -Subnet = 10.7.7.29 Subnet = 42.100.181.3/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsW0Pbgvl+hATKqQR6H4yPg1kphMsxrXvh/CMQY8dXVVD2mDWBHaL diff --git a/retiolum/hosts/Styx b/retiolum/hosts/Styx index f3bc7fc0..37083ddc 100644 --- a/retiolum/hosts/Styx +++ b/retiolum/hosts/Styx @@ -1,4 +1,3 @@ -Subnet = 10.7.7.13 Subnet = 42.37.61.123/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA4jbOi+HZIGOGNm4aBSwnq4m3Vg3IXHmYUbJx1AzP4a/yvEgswfk6 diff --git a/retiolum/hosts/UTART b/retiolum/hosts/UTART index 4a014efd..3c8628cf 100644 --- a/retiolum/hosts/UTART +++ b/retiolum/hosts/UTART @@ -1,4 +1,3 @@ -Subnet = 10.7.7.66 Subnet = 42.227.239.205/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA1tFgR6xxNZavtG44QEAEzKQixJqO9MuO5hUcklH87Sml+Mz+Ptz/ diff --git a/retiolum/hosts/ach b/retiolum/hosts/ach index 10aa21a0..26ee10f2 100644 --- a/retiolum/hosts/ach +++ b/retiolum/hosts/ach @@ -1,6 +1,4 @@ -Subnet = 10.7.7.67 Subnet = 42:c50f:d371:cf01:8cf0:0b77:bb01:5013/128 - Subnet = 42.135.28.73/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA2d5RaWiFmkuw0UhPsQCrFBNNgBwzHQMDO69rU6XlH8VSGI8HTPuI diff --git a/retiolum/hosts/alphalabs b/retiolum/hosts/alphalabs index 4473a82a..07207693 100644 --- a/retiolum/hosts/alphalabs +++ b/retiolum/hosts/alphalabs @@ -1,5 +1,4 @@ Address = 10.9.0.10 -Subnet = 10.7.7.10 Subnet = 42:0:0:0:0:0:0:a1fa/128 Subnet = 42.107.201.8/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/also b/retiolum/hosts/also index 3cfc6cdc..42d54ae2 100644 --- a/retiolum/hosts/also +++ b/retiolum/hosts/also @@ -1,6 +1,5 @@ Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128 -Subnet = 10.7.7.23 -Subnet = 23.0.0.1 +Subnet = 23.42.0.1/16 Subnet = 42.84.79.215/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry diff --git a/retiolum/hosts/armageddon421_de b/retiolum/hosts/armageddon421_de index 61183e1a..13a2c946 100644 --- a/retiolum/hosts/armageddon421_de +++ b/retiolum/hosts/armageddon421_de @@ -1,6 +1,5 @@ Address = armageddon421.de Port = 1655 - Subnet = 42.233.216.106/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAqBfXS402JOadodsFB4a/aX/eBkuQxPHjEPpW7QBueEPbCHBAyPnT diff --git a/retiolum/hosts/bergwerk b/retiolum/hosts/bergwerk index 1772b0da..43f6c1ba 100644 --- a/retiolum/hosts/bergwerk +++ b/retiolum/hosts/bergwerk @@ -1,6 +1,4 @@ -Subnet = 10.7.7.79 Subnet = 42:a7ff:3577:0526:3986:650f:c175:30a5/128 - Subnet = 42.246.229.109/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAuCX8FVI6xQepPf0goaErA35grHcBNbYvzKIXzEIOEuxiVLX4FXoY diff --git a/retiolum/hosts/c2ft b/retiolum/hosts/c2ft index 6227749f..8ce0539e 100644 --- a/retiolum/hosts/c2ft +++ b/retiolum/hosts/c2ft @@ -1,4 +1,3 @@ -Subnet = 10.7.7.24 Subnet = 42:e674:8a82:7fe4:fa51:d305:192e:846b/128 Subnet = 42.221.17.214/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/c2fthome b/retiolum/hosts/c2fthome index 9283a9c5..a8eaabc9 100644 --- a/retiolum/hosts/c2fthome +++ b/retiolum/hosts/c2fthome @@ -1,5 +1,4 @@ Address = samularity.mine.nu -Subnet = 10.7.7.222 Subnet = 42.44.64.126/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA4ADumWibheOOocw3diK27ww4xfyptLZzlPcih5BJFUPOljXN33th diff --git a/retiolum/hosts/chinaman b/retiolum/hosts/chinaman index 17375453..22f64b02 100644 --- a/retiolum/hosts/chinaman +++ b/retiolum/hosts/chinaman @@ -1,4 +1,3 @@ -Subnet = 10.7.7.6 Subnet = 42:5a1d:f491:9e47:c4cd:175f:bd87:6da5/128 Subnet = 42.207.40.226/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/cloudkrebs b/retiolum/hosts/cloudkrebs index 685e322d..fd70c09b 100644 --- a/retiolum/hosts/cloudkrebs +++ b/retiolum/hosts/cloudkrebs @@ -1,6 +1,5 @@ Address = tinc.krebs.dotcloud.com Port = 1655 - Subnet = 42.176.135.119/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA9j7kF3Vf9POQbY16LTkpxLvGFlxQ7uEOKmiZFjLfhBi9yt49n+Oj diff --git a/retiolum/hosts/destroy b/retiolum/hosts/destroy index 6530be5b..9f624c6f 100644 --- a/retiolum/hosts/destroy +++ b/retiolum/hosts/destroy @@ -1,4 +1,3 @@ -Subnet = 10.7.7.234 Subnet = 42:9277:1f1e:7599:ae4b:7cca:b4a3:fe47/128 Subnet = 42.24.21.32/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/eigenserv b/retiolum/hosts/eigenserv index 1448f9c3..ff61b3f6 100644 --- a/retiolum/hosts/eigenserv +++ b/retiolum/hosts/eigenserv @@ -1,4 +1,3 @@ -Subnet = 10.7.7.231 Subnet = 42:c9d8:ab9e:c7fe:43ff:0268:f862:42f7/128 Subnet = 42.136.75.187/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/euer b/retiolum/hosts/euer index bd13ed7f..6d1d15f6 100644 --- a/retiolum/hosts/euer +++ b/retiolum/hosts/euer @@ -1,5 +1,4 @@ Address = 84.23.67.119 -Subnet = 10.7.7.144 Subnet = 42:974a:3ecf:3c49:06c0:4cd1:3c6f:59d9/128 Subnet = 42.64.69.178/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/exile b/retiolum/hosts/exile index c67532d1..25d68ca4 100644 --- a/retiolum/hosts/exile +++ b/retiolum/hosts/exile @@ -1,4 +1,3 @@ -Subnet = 10.7.7.123 Subnet = 42.116.243.248/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA0H+DslKV6EDCZWBCJs+MFyvTR9Ej0yWthIHKzFrA4qI8rxskrGGP diff --git a/retiolum/hosts/exitium_mobilis b/retiolum/hosts/exitium_mobilis index 00f82872..3b112a0f 100644 --- a/retiolum/hosts/exitium_mobilis +++ b/retiolum/hosts/exitium_mobilis @@ -1,4 +1,3 @@ -Subnet = 10.7.7.138 Subnet = 42:0:0:0:0:0:0:AFFF/128 Subnet = 42.127.75.187/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/filebitch b/retiolum/hosts/filebitch index fec8dff1..ad61c167 100644 --- a/retiolum/hosts/filebitch +++ b/retiolum/hosts/filebitch @@ -1,4 +1,3 @@ -Subnet = 10.7.7.134 Subnet = 42:0356:a364:cc79:4c96:2c7c:13fc:0c5b/128 Subnet = 42.150.131.98/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/fuerkrebs b/retiolum/hosts/fuerkrebs index 59b09fe9..db9725b6 100644 --- a/retiolum/hosts/fuerkrebs +++ b/retiolum/hosts/fuerkrebs @@ -1,4 +1,3 @@ -Subnet = 10.7.7.188 Subnet = 42:0f19:8a1e:7865:721b:2378:bef7:1159/128 Subnet = 42.215.67.121/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/horreum_magnus b/retiolum/hosts/horreum_magnus index e5407029..3019e9cf 100644 --- a/retiolum/hosts/horreum_magnus +++ b/retiolum/hosts/horreum_magnus @@ -1,4 +1,3 @@ -Subnet = 10.7.7.137 Subnet = 42:0:0:0:0:0:0:affe/128 Subnet = 42.35.89.21/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/iiso b/retiolum/hosts/iiso index 73109152..63711f9e 100644 --- a/retiolum/hosts/iiso +++ b/retiolum/hosts/iiso @@ -1,5 +1,4 @@ Subnet = 42:b2cd:6c75:d528:e736:ec4e:fc39:8bdc/128 -Subnet = 10.7.7.218 Subnet = 42.251.230.3/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAvsjBR0FUkjiNNLhz3AArosLqEiLZY7O8L6LorfUplD/IjG9P7XXx diff --git a/retiolum/hosts/kaah b/retiolum/hosts/kaah index 7e8b9009..a90555a5 100644 --- a/retiolum/hosts/kaah +++ b/retiolum/hosts/kaah @@ -1,6 +1,4 @@ Address = kaah.ath.cx -Subnet = 10.7.7.21 - Subnet = 42.220.181.17/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAtd9+R7NYs/5LmXoFakuoFzdO/8hy4MMeGjdDqbubKyJmIO/nvQWS diff --git a/retiolum/hosts/krebsbitch b/retiolum/hosts/krebsbitch index 09e3443e..a776368a 100644 --- a/retiolum/hosts/krebsbitch +++ b/retiolum/hosts/krebsbitch @@ -1,4 +1,3 @@ -Subnet = 10.7.7.93 Subnet = 42:0398:5d7c:06c6:9978:4383:154b:3564/128 Subnet = 42.35.192.96/32 -----BEGIN RSA PUBLIC KEY----- @@ -9,4 +8,3 @@ E3urXJfdPZMh5Ajst4B/s5PymaiiUadvRnbVXjWCbtWIySHgg+Rg4Ww/47Sml1MJ 0DFEYb3RIsAW3sBsbfs54cF4jgO8YT2Pd0kIq4xey+/S14E6F6qxWizGwC2ZSF/o qSbE1GJ2HlwhCt+cIr0g6s9s6QtzaLE36wIDAQAB -----END RSA PUBLIC KEY----- - diff --git a/retiolum/hosts/krebsbob b/retiolum/hosts/krebsbob index 55186315..cd01e5a4 100644 --- a/retiolum/hosts/krebsbob +++ b/retiolum/hosts/krebsbob @@ -1,6 +1,5 @@ Address = krebsbob.no.de Port = 1655 - Subnet = 42.195.17.113/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAwF9uuth4ffpvSVd8gre70Mu6kmEQdnjlBnNu/25IPEtZIRW/nVJW @@ -10,4 +9,3 @@ WXJvoJIRCggeMggkJbiWHdKozE4ra0EUVPaVO1FJLVsmiH7q7KuF/MQwly125Mo0 Mg3XRhEMNe7mpiTznRxwA/w8h8DRPi8Qp1cfg9vgh5bKvPMDwTWhGVEKUlWDyiob 7LR/O3rM8qkOWI4nx5GhtxdaCt0V9tPebwIDAQAB -----END RSA PUBLIC KEY----- - diff --git a/retiolum/hosts/kremium b/retiolum/hosts/kremium index 93bedec1..eb47867a 100644 --- a/retiolum/hosts/kremium +++ b/retiolum/hosts/kremium @@ -1,5 +1,4 @@ Subnet = 42:88ec:8968:cc6b:978a:68b7:1004:fc8a/128 -Subnet = 10.7.7.192 Subnet = 42.135.197.75/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsdjqCyLvGfkIsawGji1CIIxGaKKdFhKJcfFK8FWiyQdgeNK/9UAh diff --git a/retiolum/hosts/miefda901 b/retiolum/hosts/miefda901 index 4ca6411a..ab25a691 100644 --- a/retiolum/hosts/miefda901 +++ b/retiolum/hosts/miefda901 @@ -1,4 +1,3 @@ -Subnet = 10.7.7.22 Subnet = 42:0:0:0:0:0:111:efda/128 Subnet = 42.85.219.211/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/miefdahome b/retiolum/hosts/miefdahome index 16437b07..c21ba679 100644 --- a/retiolum/hosts/miefdahome +++ b/retiolum/hosts/miefdahome @@ -1,5 +1,3 @@ -Subnet = 10.7.7.30 - Subnet = 42.37.203.172/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAtKNWDTK92VGAqfkoy+cWscq3Gp3UJv+NldFGny/PZHG7/0zT7Fri diff --git a/retiolum/hosts/monitoring b/retiolum/hosts/monitoring index b93ec9c7..8bc6dd16 100644 --- a/retiolum/hosts/monitoring +++ b/retiolum/hosts/monitoring @@ -1,4 +1,3 @@ -Subnet = 10.7.7.198 Subnet = 42:82cb:f60c:6f27:611a:42f8:906c:2c70/128 Subnet = 42.160.97.250/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/no_omo b/retiolum/hosts/no_omo index c344bb20..7b335565 100644 --- a/retiolum/hosts/no_omo +++ b/retiolum/hosts/no_omo @@ -1,5 +1,4 @@ Address = leechi.kicks-ass.org -Subnet = 10.7.7.111 Subnet = 42.155.101.136/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAuHQEeowvxRkoHJUw6cUp431pnoIy4MVv7kTLgWEK46nzgZtld9LM diff --git a/retiolum/hosts/oxberg b/retiolum/hosts/oxberg index 6878e327..c267b582 100644 --- a/retiolum/hosts/oxberg +++ b/retiolum/hosts/oxberg @@ -1,5 +1,4 @@ Address = 84.23.80.172 -Subnet = 10.7.7.172 Subnet = 42:c154:3219:a91c:77eb:91bb:2f18:ff75/128 Subnet = 42.160.213.134/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/pa_sharepoint b/retiolum/hosts/pa_sharepoint index ae2c3175..dd31362e 100644 --- a/retiolum/hosts/pa_sharepoint +++ b/retiolum/hosts/pa_sharepoint @@ -1,5 +1,4 @@ Address = pa-sharepoint.informatik.ba-stuttgart.de -Subnet = 10.7.7.5 Subnet = 42.80.54.58/32 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAKSle+5vi8j+auGIC41PwFRPdzuyhP/paAEht+9mWpTYYC1meyPDwQR8 diff --git a/retiolum/hosts/pfleidi b/retiolum/hosts/pfleidi index 8fb414ac..59bf8f41 100644 --- a/retiolum/hosts/pfleidi +++ b/retiolum/hosts/pfleidi @@ -1,4 +1,3 @@ -Subnet = 10.7.7.177 Subnet = 42.106.88.140/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAwdoS19bbKmVncJcf+uT5nNpyuR8SL9ekd+XMoKBpoqDf0r7ap3F2 diff --git a/retiolum/hosts/pico b/retiolum/hosts/pico new file mode 100644 index 00000000..83a465a4 --- /dev/null +++ b/retiolum/hosts/pico @@ -0,0 +1,10 @@ +Subnet = 42.0.0.42 +Subnet = 42:b103:275c:1723:edc8:b24d:452b:352a/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAsbe4wzTOHHLyuPO/AsfDqQHyV41qgs3dqt6uWcDcdiEsUvbCK9Ch +MQNkTktlrMRyvz6Qm/3DKptp80R648j0nWi/c3aLDkZq8weEnR9SFYfNaUp/GN4s ++Qhb+836d8Hu2+3jZWlr5Zb/p8hyhcx3NUH/skuH6Hu+piWczlN1NGksf5f7N/bp +ZBCXnCLLUYVM/0RIS8mcAIX44Zx8YFDXpByePUdyrzn+mRln6VFDnt5uGsmNw6G/ +Azn3grpidcyrW2cs3b7rysKsxOvyGBdu2zGXp+pquZq1l3f06IN+fzCtnyLTPL1K +UUEJlQa1Gsl2pVi5+HPcAj3U2yp42WJYNwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/pornocauster b/retiolum/hosts/pornocauster index fdde7dfd..bd1ad145 100644 --- a/retiolum/hosts/pornocauster +++ b/retiolum/hosts/pornocauster @@ -1,4 +1,3 @@ -Subnet = 10.7.7.42 Subnet = 42:0b2c:d90e:e717:03dc:9ac1:7c30:a4db/128 Subnet = 42.178.96.179/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/sir_krebs_a_lot b/retiolum/hosts/sir_krebs_a_lot index 26ebfe59..f4fffd9d 100644 --- a/retiolum/hosts/sir_krebs_a_lot +++ b/retiolum/hosts/sir_krebs_a_lot @@ -1,5 +1,4 @@ Address = 84.23.79.81 -Subnet = 10.7.7.100 Subnet = 42:48bd:f4cd:b2f1:ff6b:865c:d041:def6/128 Subnet = 42.130.57.249/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/steve b/retiolum/hosts/steve index 494c914e..f86eaa50 100644 --- a/retiolum/hosts/steve +++ b/retiolum/hosts/steve @@ -1,4 +1,3 @@ -Subnet = 10.7.7.101 Subnet = 42:58a0:e7b1:506e:b09e:1b68:5149:c6e8/128 Subnet = 42.145.33.57/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index 029de8cf..e4698009 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,7 +1,7 @@ Address = miefda.org -Subnet = 10.7.7.1 Subnet = 42:0:0:0:0:0:0:255/128 Subnet = 42.0.0.1/32 +Subnet = 0.0.0.0/0 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj diff --git a/retiolum/hosts/temperator b/retiolum/hosts/temperator index 230fd17b..25c54bf2 100644 --- a/retiolum/hosts/temperator +++ b/retiolum/hosts/temperator @@ -1,4 +1,3 @@ -Subnet = 10.7.7.200 Subnet = 42:0b56:87fb:b3ab:677f:1158:bfa0:b937/128 Subnet = 42.93.117.146/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/upm b/retiolum/hosts/upm index d87a05e9..ec1c6de5 100644 --- a/retiolum/hosts/upm +++ b/retiolum/hosts/upm @@ -1,4 +1,3 @@ -Subnet = 10.7.7.99 Subnet = 42.185.142.239/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA5fuAUXiquBrtqyZO7L6vGqR2JiWHkglJknTIrAJJLiWlnD0qeFKa diff --git a/retiolum/hosts/urkrebs b/retiolum/hosts/urkrebs index 7e2a5706..ecffaec4 100644 --- a/retiolum/hosts/urkrebs +++ b/retiolum/hosts/urkrebs @@ -1,4 +1,3 @@ -Subnet = 10.7.7.156 Subnet = 42:0c61:780c:bf22:7624:fca8:d4d7:a4fd/128 Subnet = 42.171.152.235/32 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/xso b/retiolum/hosts/xso index e554027c..1f035a78 100644 --- a/retiolum/hosts/xso +++ b/retiolum/hosts/xso @@ -1,6 +1,4 @@ -Subnet = 10.7.7.112 Subnet = 42:fb16:96ad:c849:f5d4:2170:103d:e86b/128 - Subnet = 42.124.174.80/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA1p1WG0yDOku0u8XPzN2BAcrkVeR11c8Si3sz2BNoYPitdA2wW/TE diff --git a/retiolum/hosts/ytart b/retiolum/hosts/ytart index 5170da89..9df79635 100644 --- a/retiolum/hosts/ytart +++ b/retiolum/hosts/ytart @@ -1,4 +1,3 @@ -Subnet = 10.7.7.201 Subnet = 42.82.65.226/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA2yCCN8nAPmZNL75Jr+FtfP5jmyuqg7IpgfW03L3s8Gg7NB1eTQAg diff --git a/retiolum/hosts/zerg b/retiolum/hosts/zerg index 09753a12..9e9b0a4e 100644 --- a/retiolum/hosts/zerg +++ b/retiolum/hosts/zerg @@ -1,5 +1,4 @@ Subnet = 42:448b:2bdc:d090:9f0f:a957:01a7:7254/128 -Subnet = 10.7.7.18 Subnet = 42.20.21.115/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAxLkTKBXMgChxgPlMlLqqGRx/MSZos2dkXdCw7pzyO9HRwYi2Ax1j diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py index 410e5229..b8054b0d 100755 --- a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py +++ b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py @@ -59,6 +59,9 @@ def generate_stats(nodes): pass for k,v in nodes.iteritems(): conns = v.get('to',[]) + for c in conns: #sanitize weights + if float(c['weight']) > 9000: c['weight'] = str(9001) + elif float(c['weight']) < 0: c['weight'] = str(0) v['num_conns'] = len(conns) v['avg_weight'] = get_node_avg_weight(conns) v['availability'] = get_node_availability(k,jlines) @@ -132,7 +135,7 @@ def write_node(k,v): node = " "+k+"[label=\"" node += k+"\\l" node += "availability: %f\\l" % v['availability'] - node += "avg weight: %.2f\\l" % v['avg_weight'] + #node += "avg weight: %.2f\\l" % v['avg_weight'] if v.has_key('num_conns'): node += "Num Connects:"+str(v['num_conns'])+"\\l" node += "external:"+v['external-ip']+":"+v['external-port']+"\\l" diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 402ce256..5572b9d9 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -xeuf cd $(dirname `readlink -f $0`) GRAPH_SETTER1=dot GRAPH_SETTER2=circo @@ -9,16 +10,21 @@ TYPE=svg TYPE2=png OPENER=/bin/true DOTFILE=`mktemp` -trap 'rm $DOTFILE' SIGTERM +trap 'rm $DOTFILE' INT TERM sudo LOG_FILE=$LOG_FILE python tinc_stats.py |\ python parse_tinc_stats.py > $DOTFILE -$GRAPH_SETTER1 -T$TYPE -o $1/retiolum_1.$TYPE $DOTFILE -$GRAPH_SETTER2 -T$TYPE -o $1/retiolum_2.$TYPE $DOTFILE -$GRAPH_SETTER3 -T$TYPE -o $1/retiolum_3.$TYPE $DOTFILE -$GRAPH_SETTER4 -T$TYPE -o $1/retiolum_4.$TYPE $DOTFILE + +i=1 +for setter in dot circo 'neato -Goverlap=prism ' sfdp +do + tmpgraph=`mktemp --tmpdir=$1` + $setter -T$TYPE -o $tmpgraph $DOTFILE + chmod go+rx $tmpgraph + mv $tmpgraph $1retiolum_$i.$TYPE + i=`expr $i + 1` +done #convert -resize 20% $1/retiolum_1.$TYPE $1/retiolum_1.$TYPE2 #convert -resize 20% $1/retiolum_2.$TYPE $1/retiolum_2.$TYPE2 #convert -resize 20% $1/retiolum_3.$TYPE $1/retiolum_3.$TYPE2 #convert -resize 20% $1/retiolum_4.$TYPE $1/retiolum_4.$TYPE2 -#$OPENER $1/retiolum_1.$TYPE &>/dev/null diff --git a/retiolum/scripts/adv_graphgen/tinc_stats.py b/retiolum/scripts/adv_graphgen/tinc_stats.py index be3bbbff..d0d47aff 100755 --- a/retiolum/scripts/adv_graphgen/tinc_stats.py +++ b/retiolum/scripts/adv_graphgen/tinc_stats.py @@ -78,6 +78,6 @@ def parse_input(log_data): if __name__ == '__main__': import subprocess,time - subprocess.popen("pkill -SIGUSR2 tincd") + subprocess.call(["pkill","-SIGUSR2", "tincd"]) time.sleep(1) |