From e1d391ab9dbcd26be263f8b00dcfdf5adad8f3f8 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2011 02:04:45 +0100 Subject: //retiolum hosts: killall Subnet = 10.7.7/24 --- retiolum/hosts/Lassulus | 1 - retiolum/hosts/Shepherd | 1 - retiolum/hosts/Styx | 1 - retiolum/hosts/UTART | 1 - retiolum/hosts/ach | 2 -- retiolum/hosts/alphalabs | 1 - retiolum/hosts/also | 1 - retiolum/hosts/armageddon421_de | 1 - retiolum/hosts/bergwerk | 2 -- retiolum/hosts/c2ft | 1 - retiolum/hosts/c2fthome | 1 - retiolum/hosts/chinaman | 1 - retiolum/hosts/cloudkrebs | 1 - retiolum/hosts/destroy | 1 - retiolum/hosts/eigenserv | 1 - retiolum/hosts/euer | 1 - retiolum/hosts/exile | 1 - retiolum/hosts/exitium_mobilis | 1 - retiolum/hosts/filebitch | 1 - retiolum/hosts/fuerkrebs | 1 - retiolum/hosts/horreum_magnus | 1 - retiolum/hosts/iiso | 1 - retiolum/hosts/kaah | 2 -- retiolum/hosts/krebsbitch | 2 -- retiolum/hosts/krebsbob | 2 -- retiolum/hosts/kremium | 1 - retiolum/hosts/miefda901 | 1 - retiolum/hosts/miefdahome | 2 -- retiolum/hosts/monitoring | 1 - retiolum/hosts/no_omo | 1 - retiolum/hosts/oxberg | 1 - retiolum/hosts/pa_sharepoint | 1 - retiolum/hosts/pfleidi | 1 - retiolum/hosts/pornocauster | 1 - retiolum/hosts/sir_krebs_a_lot | 1 - retiolum/hosts/steve | 1 - retiolum/hosts/supernode | 1 - retiolum/hosts/temperator | 1 - retiolum/hosts/upm | 1 - retiolum/hosts/urkrebs | 1 - retiolum/hosts/xso | 2 -- retiolum/hosts/ytart | 1 - retiolum/hosts/zerg | 1 - 43 files changed, 50 deletions(-) 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..55550897 100644 --- a/retiolum/hosts/also +++ b/retiolum/hosts/also @@ -1,5 +1,4 @@ Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128 -Subnet = 10.7.7.23 Subnet = 23.0.0.1 Subnet = 42.84.79.215/32 -----BEGIN RSA PUBLIC KEY----- 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/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..b046347e 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,5 +1,4 @@ Address = miefda.org -Subnet = 10.7.7.1 Subnet = 42:0:0:0:0:0:0:255/128 Subnet = 42.0.0.1/32 -----BEGIN RSA PUBLIC KEY----- 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 -- cgit v1.2.3 From 231a8f4101ae62c48e742cfdccb82239193315fb Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2011 02:06:17 +0100 Subject: //oncology: use 42/8 --- oncology/bin/krebshostup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oncology/bin/krebshostup b/oncology/bin/krebshostup index eb422ff7..65ccae12 100755 --- a/oncology/bin/krebshostup +++ b/oncology/bin/krebshostup @@ -1,2 +1,2 @@ #!/bin/sh -nmap -sP 10.7.7.0/24 -T5| grep "Host is up" | wc -l +nmap -sP 42.0.0.0/8 -T5| grep "Host is up" | wc -l -- cgit v1.2.3 From f51357a9ba6ca27848919eb735c1b6cabc13d0b7 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 10 Nov 2011 11:22:29 +0100 Subject: //retiolum hosts also controls 23.42/16 --- retiolum/hosts/also | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/hosts/also b/retiolum/hosts/also index 55550897..42d54ae2 100644 --- a/retiolum/hosts/also +++ b/retiolum/hosts/also @@ -1,5 +1,5 @@ Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128 -Subnet = 23.0.0.1 +Subnet = 23.42.0.1/16 Subnet = 42.84.79.215/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry -- cgit v1.2.3 From a78c067d47f295ed91242cb9a30ba9c7b4e6b572 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Thu, 10 Nov 2011 18:12:53 +0100 Subject: .gitmodules: add python-irclib for ircbots --- .gitmodules | 3 +++ submodules/github/jbalogh/python-irclib | 1 + 2 files changed, 4 insertions(+) create mode 160000 submodules/github/jbalogh/python-irclib diff --git a/.gitmodules b/.gitmodules index 3677b710..2823cad5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "submodules/github/makefu/dpfhack_display"] path = submodules/github/makefu/dpfhack_display url = https://github.com/makefu/dpfhack_pearl +[submodule "submodules/github/jbalogh/python-irclib"] + path = submodules/github/jbalogh/python-irclib + url = https://github.com/jbalogh/python-irclib.git diff --git a/submodules/github/jbalogh/python-irclib b/submodules/github/jbalogh/python-irclib new file mode 160000 index 00000000..5c347d82 --- /dev/null +++ b/submodules/github/jbalogh/python-irclib @@ -0,0 +1 @@ +Subproject commit 5c347d82f796e79adfccf5cf90846cc068e66b46 -- cgit v1.2.3 From 35be61fece8fabb430ef44c3f7a7d62d62b18ffd Mon Sep 17 00:00:00 2001 From: EUcancER Date: Thu, 10 Nov 2011 18:15:34 +0100 Subject: //retiolum/adv_graphgen: refactor graph generation, fix weight issue --- retiolum/scripts/adv_graphgen/parse_tinc_stats.py | 5 ++++- retiolum/scripts/adv_graphgen/sanitize.sh | 18 ++++++++++++------ retiolum/scripts/adv_graphgen/tinc_stats.py | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) 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) print json.dumps(parse_input((get_tinc_block(SYSLOG_FILE)))) -- cgit v1.2.3 From 0b99d25c863170e570cca2346966fa8f9a2797f4 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 11 Nov 2011 13:53:14 +0100 Subject: //infest/profiles: initial draft for profile depoyer --- infest/profiles/README | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 infest/profiles/README diff --git a/infest/profiles/README b/infest/profiles/README new file mode 100644 index 00000000..cab5fd93 --- /dev/null +++ b/infest/profiles/README @@ -0,0 +1,9 @@ +Install different profiles for a user on the system + +UseCase: +./load-profile bob + [if necessary, check out the bob submodule] + [write dotfiles of profile bob for logged-in users ~] + +./load-profile system + [write krebs additions to /etc and /root] -- cgit v1.2.3 From 29340f39ee60caf36449be35c15f670fa71e379a Mon Sep 17 00:00:00 2001 From: EUcancER Date: Fri, 11 Nov 2011 17:03:31 +0100 Subject: //punani/tightnani: initial commit tightnani-web is a web API for the (currently) nonexistant tightnani client which resolves common packages to their packer counterparts like apt-get,pacman etc. --- punani/tightnani/tightnani-web.py | 48 +++++++++++++++++++++++++++++++++++++++ punani/tightnani/tightnani_db | 25 ++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100755 punani/tightnani/tightnani-web.py create mode 100644 punani/tightnani/tightnani_db diff --git a/punani/tightnani/tightnani-web.py b/punani/tightnani/tightnani-web.py new file mode 100755 index 00000000..52f5004f --- /dev/null +++ b/punani/tightnani/tightnani-web.py @@ -0,0 +1,48 @@ +#!/usr/bin/python + +import web +import json + +urls = ( + '/', 'Index', + '/dump','Dump', + '/reload','Reload', + '/(.+)/(.+)', 'ArchFinder', +) + + +PDB_FILE="tightnani_db" + +pdb= json.load(open(PDB_FILE)) + +class Index: + def GET(self): + ret = """Welcome to the Tightnani API
+Retrieve a package name for your distribution with: /ARCH/PKG""" + return ret + +class Reload: + def GET(self): + pdb= json.load(open(PDB_FILE)) + return "DB reloaded" + + +class Dump: + def GET(self): + return json.dumps(pdb,sort_keys=True,indent=4) + +class ArchFinder: + def GET(self,packer,package): + if not packer or not package: web.BadRequest() + else: + packer = pdb['packer-symlinks'].get(packer,packer) #try to resolve similar packers + ret = pdb.get(package,{}).get(packer,False) + if not ret: web.NotFound() + else: return ret + + + +if __name__ == "__main__": + app = web.application(urls,globals()) + app.internalerror = web.debugerror + app.run() diff --git a/punani/tightnani/tightnani_db b/punani/tightnani/tightnani_db new file mode 100644 index 00000000..d15a9ad4 --- /dev/null +++ b/punani/tightnani/tightnani_db @@ -0,0 +1,25 @@ +{ + "packer-symlinks" : { + "packer" : "yaourt", + "aptitude" : "apt-get", + "bauerbill" : "yaourt" + }, + "vim" : { + "apt-get" : "vim", + "pacman" : "vim", + "brew" : "vim", + "yum" : "vim" + }, + "python" : { + "apt-get" : "python", + "pacman" : "python2" + }, + "python2" : { + "apt-get" : "python", + "pacman" : "python2" + }, + "python3" : { + "apt-get" : "python3", + "pacman" : "python" + } +} -- cgit v1.2.3 From d8c022c85e1a93da813b0aebf5002fa87c387879 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 11 Nov 2011 23:29:22 +0100 Subject: //cholerab/reports/Empera.txt: initial commit --- cholerab/reports/Empera.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 cholerab/reports/Empera.txt diff --git a/cholerab/reports/Empera.txt b/cholerab/reports/Empera.txt new file mode 100644 index 00000000..e972c8c7 --- /dev/null +++ b/cholerab/reports/Empera.txt @@ -0,0 +1,53 @@ +Datum: 2011-11-11 22:13 + +Zutaten: + - 250ml La Emperatriz 2006 CRIANZA RIOJA (13,5% VOL) EM No 825078 (EUR 11.5) + - 3mg b0463c6c9cc0ab65a467d620be5a40f1217f1038 Pulver + - 50mg d5fe8c3fc8ba214b334c6eb6cdae6b3dcc0d63e3 Gelantine-Kapsel + - 5mg Zink Gelantine-Kapsel + - 300mg C Gelantine-Kapsel + - 300mg Mg gepresst + - 100mg B6 gepresst + - 95.2mg Fe(II) Dragee + +Probanden: + 3x mit super-vollem Magen, ein Proband ohne Kapsel + +Start: 2011-11-11 22:35:09+01:00 + +Farbe: Super-Schwarz-Rot + +Gerucht: + frisch und fruchtig + hat was von Brombeeren + Organisch + leicht gammelig (hat was von fauligen Pflaumen) + +Geschmack: + halb-trocken + fast bisschen zu fruchtig + finde ich nicht zu fruchtig + bisschen bitter + besser zu Nudelgericht (wir hatten dicke Nudelsuppe) + leichte Zitrusnote im Abgang + der hat das Ekelhafte, was auch andere schaebige Weine haben + fuer melancholische Sommerabende (man kann die letzten Sonnenstrahlen + rausspuehren)--da wurde doch einer gepanscht + Eine echte Emperatriz--eine Dame des Hasses. + Wuerde definitiv gut gehen mit was halbwegs herzhaften zu Essen. + ganz und garnicht lieblich. + +Fazit: + Trinkbar aber nicht der Beste. + Ich hatte auch schon Bessere. + ALDI-Weine sind billiger und besser. + Sie verspricht mehr als sie haelt. + Ich wuerd sie wieder tun. + +Checkpoint: 2011-11-11 23:05:24+01:00 + +SpO₂: 98 96 97 + +BPM: 71 75 73 + + -- cgit v1.2.3 From 4120ded2c85c82ab58d92ff922c50ed7ba19f22e Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 12 Nov 2011 22:30:26 +0100 Subject: //census: update readme --- census/README.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/census/README.md b/census/README.md index e45d39c1..2842368d 100644 --- a/census/README.md +++ b/census/README.md @@ -1,13 +1,23 @@ -ARPING Users +Census (formerly known as ARPING Users) ========== This is a simplified python script which checks the available subnet for computers online and returns a list of users which are online based on their mac-address +The initial idea was to find known users in the given network, now it finds and stores everyone in the given network and might try to resolve these addresses into names. This is why the name `census` is coined for the project. -arping_users.py: - call `python arping_users.py v` for verbose output -> print all discovered hosts +Return Data +---------- +after trying to reach all hosts in the selected subnets the script spits out th e following data: +
+    { "timestamp" : 12345678, "data" : { "ip1" : ["mac1","mac2","macn"] } 
+
+ +Census is meant to be put into a cronjob or some kind of wrapper scripts as it is currently really really (2-3 minutes) slow. SNMPWALK Command =============== +For historic reasons, this is the snmpwalk command to pull the currently registered mac-addresses on the firewall: +
 snmpwalk -c shammunity 10.42.0.1 1.3.6.1.2.1.3.1.1.2
+
-- cgit v1.2.3 From 5b5fb91811337a13fdfaa4b5d744a60873af4b62 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 13 Nov 2011 15:52:05 +0100 Subject: //cholerab krebs-v2.xpm: initial commit --- cholerab/bling/krebs-v2.xpm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 cholerab/bling/krebs-v2.xpm diff --git a/cholerab/bling/krebs-v2.xpm b/cholerab/bling/krebs-v2.xpm new file mode 100644 index 00000000..cc411095 --- /dev/null +++ b/cholerab/bling/krebs-v2.xpm @@ -0,0 +1,24 @@ +/* XPM */ +static char *krebs_v2[] = { +/* columns rows colors chars-per-pixel */ +"16 16 2 1 ", +" c None", +"x c #E4002B", +/* pixels */ +" ", +" ", +" x x x x", +"xx x xx xx xx x", +"xx x xx xx xx x", +" xxx x x xxx", +" xxx xxxxx xxx", +" x xxxxxxx x ", +" xxxxxxxxxxxxx ", +" xxxxxxx ", +" xxxxxxxxxxx ", +" x xxx x ", +" x x x x x x ", +" x x x x x x ", +" x xx x x xx x ", +" ", +}; -- cgit v1.2.3 From 6cb5ecc45d2b73952d441aaf913968d60beac305 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Nov 2011 00:43:08 +0100 Subject: added defaultroute --- retiolum/hosts/supernode | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index b046347e..e4698009 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,6 +1,7 @@ Address = miefda.org 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 -- cgit v1.2.3 From 3038318c25b4af80df99dd36581fe419b4032109 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Nov 2011 01:01:06 +0100 Subject: tincrouting ftw! --- cholerab/tincrouting | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 cholerab/tincrouting diff --git a/cholerab/tincrouting b/cholerab/tincrouting new file mode 100644 index 00000000..a26c0354 --- /dev/null +++ b/cholerab/tincrouting @@ -0,0 +1,6 @@ +add 0.0.0.0/0 to hostsfile + +echo 1 >/proc/sys/net/ipv4/ip_forward + +/sbin/iptables -P FORWARD ACCEPT +/sbin/iptables --table nat -A POSTROUTING -o eth0 -j MASQUERADE -- cgit v1.2.3 From 0fe81e9301efa359fba9f7eae498cc69cbe1f87f Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Nov 2011 01:04:19 +0100 Subject: added portforwarding --- cholerab/tincrouting | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cholerab/tincrouting b/cholerab/tincrouting index a26c0354..f430da4e 100644 --- a/cholerab/tincrouting +++ b/cholerab/tincrouting @@ -1,6 +1,9 @@ -add 0.0.0.0/0 to hostsfile +#add 0.0.0.0/0 to hostsfile echo 1 >/proc/sys/net/ipv4/ip_forward /sbin/iptables -P FORWARD ACCEPT /sbin/iptables --table nat -A POSTROUTING -o eth0 -j MASQUERADE + +#for supercool portforwarding: +#example!: /sbin/iptables -t nat -A PREROUTING -p tcp -i eth0 -d jgibbs.dyndns.org --dport 3389 -j DNAT --to 172.17.207.4:3389 -- cgit v1.2.3 From 397208108aebe171abded46aa4892aa32e6ff41d Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 14 Nov 2011 03:33:19 +0100 Subject: //too_old: add script to fetch 28C3 tickets --- too_old/mechanize_tickets.py | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 too_old/mechanize_tickets.py diff --git a/too_old/mechanize_tickets.py b/too_old/mechanize_tickets.py new file mode 100644 index 00000000..1f12a996 --- /dev/null +++ b/too_old/mechanize_tickets.py @@ -0,0 +1,53 @@ +#!/usr/bin/python +import mechanize +import cookielib +import time,sys +USERNAME = 'momo' +PASSWORD = '' + + +def main(): + try: + br = init_browser() + while not do_login(br): + print ("Could Not Login, retrying!") + while not fetch_ticket(br): + time.sleep(0.2) + print ("Could not fetch ticket, retrying!") + except Exception,e: + print ("Caught Exception: %s" % str(e)) + exit (1) + print ("We won? yay") + exit(0) + +def init_browser(): + br = mechanize.Browser() + br.open("https://presale.events.ccc.de/order") + cj = cookielib.LWPCookieJar() + br.set_cookiejar(cj) + br.addheaders = [('User-agent', 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.1) Gecko/2008071615 Fedora/3.0.1-1.fc9 Firefox/3.0.1')] + return br +def do_login(br): + br.select_form(nr=0) + br.form['account[username]'] = USERNAME + br.form['account[password]'] = PASSWORD + br.submit() + ret = br.response().read() + if 'Signed in successfully.' in ret: + if not "Confirm Order" in ret: + print("Something else is wrong, cannot find 'Confirm Order' button!") + raise Exception("Cannot find Confirm Order button") + return True + else: return False + +def fetch_ticket(br): + br.select_form(nr=0) + br.submit() + ret = br.response().read() + if not 'There are currently not enough tickets available.' in ret: + print ("we won? Better sleep some time to be sure") + return True + else: return False + +if __name__ == "__main__": + main() -- cgit v1.2.3 From 9d7c537fd978f4848480b189ddb21f3b44eedec0 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 14 Nov 2011 03:34:18 +0100 Subject: //census: update Readme --- census/README.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/census/README.md b/census/README.md index e45d39c1..2842368d 100644 --- a/census/README.md +++ b/census/README.md @@ -1,13 +1,23 @@ -ARPING Users +Census (formerly known as ARPING Users) ========== This is a simplified python script which checks the available subnet for computers online and returns a list of users which are online based on their mac-address +The initial idea was to find known users in the given network, now it finds and stores everyone in the given network and might try to resolve these addresses into names. This is why the name `census` is coined for the project. -arping_users.py: - call `python arping_users.py v` for verbose output -> print all discovered hosts +Return Data +---------- +after trying to reach all hosts in the selected subnets the script spits out th e following data: +
+    { "timestamp" : 12345678, "data" : { "ip1" : ["mac1","mac2","macn"] } 
+
+ +Census is meant to be put into a cronjob or some kind of wrapper scripts as it is currently really really (2-3 minutes) slow. SNMPWALK Command =============== +For historic reasons, this is the snmpwalk command to pull the currently registered mac-addresses on the firewall: +
 snmpwalk -c shammunity 10.42.0.1 1.3.6.1.2.1.3.1.1.2
+
-- cgit v1.2.3 From 1f61333b2ae21ccb985e7321f07c2c5c94eb8a4c Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 14 Nov 2011 03:36:31 +0100 Subject: //cholerab/news/Candidate: add 28c3 ticket fetcher --- cholerab/news/Candidate | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cholerab/news/Candidate b/cholerab/news/Candidate index 31d2c670..00c64361 100644 --- a/cholerab/news/Candidate +++ b/cholerab/news/Candidate @@ -100,8 +100,14 @@ Nachdem Gedaechnistausch von Fuerkrebs und Urkrebs hat es ja wie beschrieben die Der Graphengenerator fuer KD;RP (siehe [ɐ]ist ueberarbeitet worden und bietet seit dem 2011-10-23 die moeglichkeit Statistiken zu dem Netzwerk und einzelnen Nodes auszugeben. Hervorzuheben ist hierbei die funktionalitaet die Availability von Nodes zu beschreiben, also wie wahrscheinlich es ist einen Knoten X zu einem Zeitpunkt Y im Darknet anzutreffen. Zusaetzlich wurde die Stats-generator engine ueberarbeitet und laeuft nun besonders bei grossen /var/log/syslog files schneller [⠣]. +## TODO 10. Ticket-fetcher fuer den 28C2 + +Da die 28C3 Presales Tickets rar sind und Leute anfangen das einkaufen zu automatisieren kann nicht auf das glueck des tuechtigen gehofft werden, sondern auch fuer den shack wird automatisiert. Herausgekommen ist ein Skript[Բ] (basierend auf einem anderen Skript[в] welches aber zu hart gesuckt hat) welches sich auf der Presales seite einloggt und dort den "Confirm Order" button drueckt. Das ganze wird in eine ELoop gepackt und den Tickets steht nun nichts mehr im wege. Gebaut wurde das Skript in der nacht am 14.November (T-10H) bis zur naechsten Presales Runde fuer den 28C3. + [⠣] https://github.com/krebscode/painload/commit/822c43a763aa61c1accce3768090d066048faaff [⌅] man dd +[в] http://pastebin.com/SRwtNwKS [Ȳ] http://shackspace.de/wiki/doku.php?id=project:krebs#fuerkrebs +[Բ] https://github.com/krebscode/painload/blob/master/too_old/mechanize_tickets.py [Ƀ] https://github.com/krebscode/painload/tree/master/census [ɐ] http://euer.krebsco.de/graphs/retiolum/retiolum_1.svg -- cgit v1.2.3 From b92f01466d34d23647a3c619f18a3d1f92400546 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Nov 2011 15:24:16 +0100 Subject: added default route Styx --- retiolum/hosts/Styx | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/Styx b/retiolum/hosts/Styx index 37083ddc..b05eaac5 100644 --- a/retiolum/hosts/Styx +++ b/retiolum/hosts/Styx @@ -1,4 +1,5 @@ Subnet = 42.37.61.123/32 +Subnet = 0.0.0.0/0 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA4jbOi+HZIGOGNm4aBSwnq4m3Vg3IXHmYUbJx1AzP4a/yvEgswfk6 MP5FXvoY/hZ0NQ0IRzbbJxGbcUdulz0WSjX1C+8uQUZstz+lvYZ4FeCXcdE5cuFM -- cgit v1.2.3 From d38c8599433838ac5d48372c76b6f006392353d2 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Mon, 14 Nov 2011 17:14:30 +0100 Subject: //cholerab/news/Candidate: add Ticket Update --- cholerab/news/Candidate | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cholerab/news/Candidate b/cholerab/news/Candidate index 00c64361..b8bdd893 100644 --- a/cholerab/news/Candidate +++ b/cholerab/news/Candidate @@ -102,11 +102,15 @@ Der Graphengenerator fuer KD;RP (siehe [ɐ]ist ueberarbeitet worden und bietet s ## TODO 10. Ticket-fetcher fuer den 28C2 -Da die 28C3 Presales Tickets rar sind und Leute anfangen das einkaufen zu automatisieren kann nicht auf das glueck des tuechtigen gehofft werden, sondern auch fuer den shack wird automatisiert. Herausgekommen ist ein Skript[Բ] (basierend auf einem anderen Skript[в] welches aber zu hart gesuckt hat) welches sich auf der Presales seite einloggt und dort den "Confirm Order" button drueckt. Das ganze wird in eine ELoop gepackt und den Tickets steht nun nichts mehr im wege. Gebaut wurde das Skript in der nacht am 14.November (T-10H) bis zur naechsten Presales Runde fuer den 28C3. +Da die 28C3 Presales Tickets rar sind und Leute anfangen das einkaufen zu automatisieren kann nicht auf das glueck des tuechtigen gehofft werden, sondern auch fuer den shack wird automatisiert. Herausgekommen ist ein Skript[Բ] (basierend auf einem anderen Skript[в] welches aber zu hart gesuckt hat) welches sich auf der Presales seite einloggt und dort den "Confirm Order" button drueckt. Das ganze wird in eine ELoop gepackt und den Tickets steht nun nichts mehr im wege. Gebaut wurde das Skript in der nacht am 14.November (T-10H) bis zur naechsten Presales Runde fuer den 28C3. + +UPDATE 14.11.2011 16:30: Die Tickets sind bestellt, das Ziel ist erreicht. Allerdings nicht von einem der deployten Skripten gefetcht, sondern durch die manuelle Klick-Kraft[1]. Fuer das naechste Jahr muss das skript also noch viel aggressiver fetchen und die bandbreite mit HTTP requests fuellen. + [⠣] https://github.com/krebscode/painload/commit/822c43a763aa61c1accce3768090d066048faaff [⌅] man dd [в] http://pastebin.com/SRwtNwKS +[1] http://f.cl.ly/items/213N2l0c1p3d24332l0X/ragecomic.png [Ȳ] http://shackspace.de/wiki/doku.php?id=project:krebs#fuerkrebs [Բ] https://github.com/krebscode/painload/blob/master/too_old/mechanize_tickets.py [Ƀ] https://github.com/krebscode/painload/tree/master/census -- cgit v1.2.3 From 3a1cb73a2472979e26477a893e346530cf20bb2d Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Nov 2011 22:24:14 +0100 Subject: added host pico --- retiolum/hosts/pico | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/pico 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----- -- cgit v1.2.3 From 3a9b0e520ba6602481ab95f0a81cde02f8f24445 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 15 Nov 2011 16:14:11 +0100 Subject: m0ar defaultroutes! --- retiolum/hosts/Lassulus | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/Lassulus b/retiolum/hosts/Lassulus index 594d1203..f794d06c 100644 --- a/retiolum/hosts/Lassulus +++ b/retiolum/hosts/Lassulus @@ -1,5 +1,6 @@ Subnet = 42:0:0:0:0:0:0:dea7/128 Subnet = 42.251.103.67/32 +Subnet = 0.0.0.0/0 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE H0QwkiMmk3aZy1beq3quM6gX13aT+/wMfWnLyuvT11T5C9JEf/IS91STpM2BRN+R -- cgit v1.2.3 From fa0b8a46563439b0364a3c5a63fa69f3bd560441 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Tue, 15 Nov 2011 17:29:12 +0100 Subject: //monitoring: add new shinken monitoring stuff --- Monitoring/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Monitoring/Makefile b/Monitoring/Makefile index 794f9262..4730f30d 100644 --- a/Monitoring/Makefile +++ b/Monitoring/Makefile @@ -1,6 +1,7 @@ NAGDIR = /etc/nagios3/ NAGLIBDIR = /usr/lib/nagios HTDOCS = /usr/share/nagios3/htdocs +KREBS = /krebs .phony: debian debian: @@ -21,3 +22,11 @@ debian: chown nagios:www-data /var/lib/nagios3/rw || true chmod g+x /var/lib/nagios3 || true chmod ugo=rwx /var/lib/nagios3/rw/nagios.cmd || true + +debian-shinken: + curl https://raw.github.com/nicolargo/shinkenautoinstall/master/shinkenautoinstall-debian.sh | sh + +shinken-discover-hosts: /etc/shinken/resources.cfg + sed -i '/.*NMAPTARGETS.*/d' /etc/shinken/resource.cfg + $(KREBS)/retiolum/bin/hosts | awk '{print $2}'| tr '\n' ' ' | xargs echo '$$NMAPTARGETS$$=' | magic create krebs-discovery /etc/shinken/resource.cfg + shinken-discovery -o /etc/shinken/objects/discovery -- cgit v1.2.3 From c77015310e7928d8330b2b5a8483f02055bb3376 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 15 Nov 2011 19:22:34 +0100 Subject: deleted routes for testing --- retiolum/hosts/Lassulus | 1 - retiolum/hosts/Styx | 1 - retiolum/hosts/supernode | 1 - 3 files changed, 3 deletions(-) diff --git a/retiolum/hosts/Lassulus b/retiolum/hosts/Lassulus index f794d06c..594d1203 100644 --- a/retiolum/hosts/Lassulus +++ b/retiolum/hosts/Lassulus @@ -1,6 +1,5 @@ Subnet = 42:0:0:0:0:0:0:dea7/128 Subnet = 42.251.103.67/32 -Subnet = 0.0.0.0/0 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE H0QwkiMmk3aZy1beq3quM6gX13aT+/wMfWnLyuvT11T5C9JEf/IS91STpM2BRN+R diff --git a/retiolum/hosts/Styx b/retiolum/hosts/Styx index b05eaac5..37083ddc 100644 --- a/retiolum/hosts/Styx +++ b/retiolum/hosts/Styx @@ -1,5 +1,4 @@ Subnet = 42.37.61.123/32 -Subnet = 0.0.0.0/0 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA4jbOi+HZIGOGNm4aBSwnq4m3Vg3IXHmYUbJx1AzP4a/yvEgswfk6 MP5FXvoY/hZ0NQ0IRzbbJxGbcUdulz0WSjX1C+8uQUZstz+lvYZ4FeCXcdE5cuFM diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode index e4698009..b046347e 100644 --- a/retiolum/hosts/supernode +++ b/retiolum/hosts/supernode @@ -1,7 +1,6 @@ Address = miefda.org 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 -- cgit v1.2.3 From fd04c6512e502e7518fce110901a04a909b345ef Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Nov 2011 15:44:46 +0100 Subject: removed ALRM --- retiolum/Makefile | 1 - 1 file changed, 1 deletion(-) 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 -- cgit v1.2.3 From c97518523b910ca7412f69de3803739affe2c583 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Wed, 16 Nov 2011 18:35:13 +0100 Subject: //punani: tightnani-web is now able to handle fallback(super-) package manager --- punani/tightnani/tightnani-web.py | 7 ++++++- punani/tightnani/tightnani_db | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/punani/tightnani/tightnani-web.py b/punani/tightnani/tightnani-web.py index 52f5004f..4386bbae 100755 --- a/punani/tightnani/tightnani-web.py +++ b/punani/tightnani/tightnani-web.py @@ -18,7 +18,7 @@ pdb= json.load(open(PDB_FILE)) class Index: def GET(self): ret = """Welcome to the Tightnani API
-Retrieve a package name for your distribution with: /ARCH/PKG""" +Retrieve a package name for your distribution with: /PACKER/PKG""" return ret class Reload: @@ -36,13 +36,18 @@ class ArchFinder: if not packer or not package: web.BadRequest() else: packer = pdb['packer-symlinks'].get(packer,packer) #try to resolve similar packers + super_packer = pdb['super-packer'].get(packer,'') ret = pdb.get(package,{}).get(packer,False) + ret = ret if ret else pdb.get(package,{}).get(super_packer,False) + if not ret: web.NotFound() else: return ret if __name__ == "__main__": + import sys + sys.argv.append("9111") app = web.application(urls,globals()) app.internalerror = web.debugerror app.run() diff --git a/punani/tightnani/tightnani_db b/punani/tightnani/tightnani_db index d15a9ad4..4c2d4843 100644 --- a/punani/tightnani/tightnani_db +++ b/punani/tightnani/tightnani_db @@ -4,6 +4,9 @@ "aptitude" : "apt-get", "bauerbill" : "yaourt" }, + "super-packer" : { + "yaourt" : "pacman" + }, "vim" : { "apt-get" : "vim", "pacman" : "vim", -- cgit v1.2.3 From f5c086a61ed2cf493d2e6edb0edf0f32230bb615 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 16 Nov 2011 19:29:44 +0100 Subject: //punani/tightnani_client: initial commit the tigtnani client finds your package manager and the required parameters to handle the manager. currently it is able to remove and install : pacman (and derivates), apt (and derivates), yum and brew. Nothing is tested so be aware --- punani/tightnani/tightnani_client | 59 +++++++++++++++++++++++++++++++++++++++ punani/tightnani/tightnani_db | 6 +++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100755 punani/tightnani/tightnani_client diff --git a/punani/tightnani/tightnani_client b/punani/tightnani/tightnani_client new file mode 100755 index 00000000..d2a598d3 --- /dev/null +++ b/punani/tightnani/tightnani_client @@ -0,0 +1,59 @@ +#!/bin/bash +set -xeuf + +if [ $# -ne 2 ];then + echo "usage: `basename $0` (install|remove) PACKAGE" + exit 23 +fi + +PACKERS="yum!-y install remove +brew install remove +pacman!--noconfirm -S!--needed -Rcs +bauerbill!--noconfirm -S!--needed -Rcs +yaourt!--noconfirm -S!--needed -Rcs +packer!--noconfirm -S!--needed -Rcs +apt-get!--yes install remove +aptitude!--yes install remove" + +OIFS=$IFS +PACKER= +IFS=' +' + +TIGHTNANI_HOST="http://euer.krebsco.de:9111" +# Find suitable packer +for PACKER_LINE in $PACKERS; do + TRY_PACKER_CMD="$(echo "$PACKER_LINE" | cut -d ' ' -f 1)" + TRY_PACKER="$(echo "$TRY_PACKER_CMD" | cut -d '!' -f 1)" + if which $TRY_PACKER &>/dev/null; then + PACKER=$TRY_PACKER + PACKER_CMD="$(echo "$TRY_PACKER_CMD" | tr "!" " ")" + echo "you got $PACKER" + INSTALL_PARAM="$(echo "$PACKER_LINE" | cut -d ' ' -f 2 | tr "!" " ")" + REMOVE_PARAM="$(echo "$PACKER_LINE" | cut -d ' ' -f 3 | tr "!" " ")" + fi +done +IFS=$OIFS +if [ ! "$PACKER" ];then + echo "Could not find a supported packer for you, bailing out!" + exit 23 +fi + + +# find the package name +PKG="$2" +RESOLVED=`wget -O- $TIGHTNANI_HOST/$PACKER/$PKG` +if [ ! "$RESOLVED" ];then + echo "Could not resolve your requested package, bailing out!" + exit 23 +fi +case "$1" in + install) + exec $PACKER_CMD $INSTALL_PARAM $RESOLVED + ;; + remove) + exec $PACKER_CMD $REMOVE_PARAM $RESOLVED + ;; + *) + echo "usage: `basename $0` (install|remove) PACKAGE" +esac diff --git a/punani/tightnani/tightnani_db b/punani/tightnani/tightnani_db index d15a9ad4..322e28f8 100644 --- a/punani/tightnani/tightnani_db +++ b/punani/tightnani/tightnani_db @@ -21,5 +21,9 @@ "python3" : { "apt-get" : "python3", "pacman" : "python" - } + }, + "tinc" : { + "apt-get" : "tinc", + "yaourt" : "tinc" + } } -- cgit v1.2.3 From 655db45a3ef4ca58f9e9fe42bba015d1fd1eccb6 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 16 Nov 2011 19:34:09 +0100 Subject: //punani: tightnani is now less verbose --- punani/tightnani/tightnani_client | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/punani/tightnani/tightnani_client b/punani/tightnani/tightnani_client index d2a598d3..8caf669e 100755 --- a/punani/tightnani/tightnani_client +++ b/punani/tightnani/tightnani_client @@ -1,5 +1,5 @@ #!/bin/bash -set -xeuf +set -euf if [ $# -ne 2 ];then echo "usage: `basename $0` (install|remove) PACKAGE" @@ -42,7 +42,7 @@ fi # find the package name PKG="$2" -RESOLVED=`wget -O- $TIGHTNANI_HOST/$PACKER/$PKG` +RESOLVED=`wget -O- $TIGHTNANI_HOST/$PACKER/$PKG 2>/dev/null` if [ ! "$RESOLVED" ];then echo "Could not resolve your requested package, bailing out!" exit 23 -- cgit v1.2.3 From 8575b9856aca6809bce214fd8a199c990cb6561c Mon Sep 17 00:00:00 2001 From: EUcancER Date: Wed, 16 Nov 2011 22:27:12 +0100 Subject: //punani: tightnani_client -> tinani, add packages --- punani/tightnani/tightnani_client | 59 --------------------------------------- punani/tightnani/tightnani_db | 26 ++++++++++++++++- punani/tightnani/tinani | 59 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 60 deletions(-) delete mode 100755 punani/tightnani/tightnani_client create mode 100755 punani/tightnani/tinani diff --git a/punani/tightnani/tightnani_client b/punani/tightnani/tightnani_client deleted file mode 100755 index 8caf669e..00000000 --- a/punani/tightnani/tightnani_client +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -set -euf - -if [ $# -ne 2 ];then - echo "usage: `basename $0` (install|remove) PACKAGE" - exit 23 -fi - -PACKERS="yum!-y install remove -brew install remove -pacman!--noconfirm -S!--needed -Rcs -bauerbill!--noconfirm -S!--needed -Rcs -yaourt!--noconfirm -S!--needed -Rcs -packer!--noconfirm -S!--needed -Rcs -apt-get!--yes install remove -aptitude!--yes install remove" - -OIFS=$IFS -PACKER= -IFS=' -' - -TIGHTNANI_HOST="http://euer.krebsco.de:9111" -# Find suitable packer -for PACKER_LINE in $PACKERS; do - TRY_PACKER_CMD="$(echo "$PACKER_LINE" | cut -d ' ' -f 1)" - TRY_PACKER="$(echo "$TRY_PACKER_CMD" | cut -d '!' -f 1)" - if which $TRY_PACKER &>/dev/null; then - PACKER=$TRY_PACKER - PACKER_CMD="$(echo "$TRY_PACKER_CMD" | tr "!" " ")" - echo "you got $PACKER" - INSTALL_PARAM="$(echo "$PACKER_LINE" | cut -d ' ' -f 2 | tr "!" " ")" - REMOVE_PARAM="$(echo "$PACKER_LINE" | cut -d ' ' -f 3 | tr "!" " ")" - fi -done -IFS=$OIFS -if [ ! "$PACKER" ];then - echo "Could not find a supported packer for you, bailing out!" - exit 23 -fi - - -# find the package name -PKG="$2" -RESOLVED=`wget -O- $TIGHTNANI_HOST/$PACKER/$PKG 2>/dev/null` -if [ ! "$RESOLVED" ];then - echo "Could not resolve your requested package, bailing out!" - exit 23 -fi -case "$1" in - install) - exec $PACKER_CMD $INSTALL_PARAM $RESOLVED - ;; - remove) - exec $PACKER_CMD $REMOVE_PARAM $RESOLVED - ;; - *) - echo "usage: `basename $0` (install|remove) PACKAGE" -esac diff --git a/punani/tightnani/tightnani_db b/punani/tightnani/tightnani_db index 6ae8098c..3641350d 100644 --- a/punani/tightnani/tightnani_db +++ b/punani/tightnani/tightnani_db @@ -28,5 +28,29 @@ "tinc" : { "apt-get" : "tinc", "yaourt" : "tinc" - } + }, + "python-notify" : { + "pacman" : "python-notify", + "apt-get" : "python-notify" + }, + "python-dbus" : { + "pacman" : "dbus-python", + "apt-get" : "python-dbus" + }, + "w3m" : { + "pacman" : "w3m", + "apt-get" : "w3m" + }, + "make" : { + "pacman" : "make", + "apt-get" : "make" + }, + "perl-xml-simple" : { + "apt-get" : "libxml-simple-perl", + "pacman" : "perl-xml-simple" + }, + "hostname" : { + "pacman" : "inetutils", + "apt-get" : "hostname" + } } diff --git a/punani/tightnani/tinani b/punani/tightnani/tinani new file mode 100755 index 00000000..8caf669e --- /dev/null +++ b/punani/tightnani/tinani @@ -0,0 +1,59 @@ +#!/bin/bash +set -euf + +if [ $# -ne 2 ];then + echo "usage: `basename $0` (install|remove) PACKAGE" + exit 23 +fi + +PACKERS="yum!-y install remove +brew install remove +pacman!--noconfirm -S!--needed -Rcs +bauerbill!--noconfirm -S!--needed -Rcs +yaourt!--noconfirm -S!--needed -Rcs +packer!--noconfirm -S!--needed -Rcs +apt-get!--yes install remove +aptitude!--yes install remove" + +OIFS=$IFS +PACKER= +IFS=' +' + +TIGHTNANI_HOST="http://euer.krebsco.de:9111" +# Find suitable packer +for PACKER_LINE in $PACKERS; do + TRY_PACKER_CMD="$(echo "$PACKER_LINE" | cut -d ' ' -f 1)" + TRY_PACKER="$(echo "$TRY_PACKER_CMD" | cut -d '!' -f 1)" + if which $TRY_PACKER &>/dev/null; then + PACKER=$TRY_PACKER + PACKER_CMD="$(echo "$TRY_PACKER_CMD" | tr "!" " ")" + echo "you got $PACKER" + INSTALL_PARAM="$(echo "$PACKER_LINE" | cut -d ' ' -f 2 | tr "!" " ")" + REMOVE_PARAM="$(echo "$PACKER_LINE" | cut -d ' ' -f 3 | tr "!" " ")" + fi +done +IFS=$OIFS +if [ ! "$PACKER" ];then + echo "Could not find a supported packer for you, bailing out!" + exit 23 +fi + + +# find the package name +PKG="$2" +RESOLVED=`wget -O- $TIGHTNANI_HOST/$PACKER/$PKG 2>/dev/null` +if [ ! "$RESOLVED" ];then + echo "Could not resolve your requested package, bailing out!" + exit 23 +fi +case "$1" in + install) + exec $PACKER_CMD $INSTALL_PARAM $RESOLVED + ;; + remove) + exec $PACKER_CMD $REMOVE_PARAM $RESOLVED + ;; + *) + echo "usage: `basename $0` (install|remove) PACKAGE" +esac -- cgit v1.2.3 From 1b0c87879d80fd7e70edb10a93b6010a014bbd15 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Wed, 16 Nov 2011 22:54:27 +0100 Subject: //punani: db - add pip package manager --- punani/tightnani/tightnani_db | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/punani/tightnani/tightnani_db b/punani/tightnani/tightnani_db index 3641350d..318f0e27 100644 --- a/punani/tightnani/tightnani_db +++ b/punani/tightnani/tightnani_db @@ -52,5 +52,9 @@ "hostname" : { "pacman" : "inetutils", "apt-get" : "hostname" - } + }, + "pip" : { + "pacman" : "python-pip", + "apt-get" : "python-pip" + } } -- cgit v1.2.3 From 4e8fa61ec02b6f05134e8b95239d1821a46de57c Mon Sep 17 00:00:00 2001 From: EUcancER Date: Wed, 16 Nov 2011 22:56:47 +0100 Subject: //tightnani-web: add error message: --- punani/tightnani/tightnani-web.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/punani/tightnani/tightnani-web.py b/punani/tightnani/tightnani-web.py index 4386bbae..4e6a64a4 100755 --- a/punani/tightnani/tightnani-web.py +++ b/punani/tightnani/tightnani-web.py @@ -12,8 +12,9 @@ urls = ( PDB_FILE="tightnani_db" - -pdb= json.load(open(PDB_FILE)) +f = open(PDB_FILE) +pdb= json.load(f) +f.close() class Index: def GET(self): @@ -23,7 +24,9 @@ Retrieve a package name for your distribution with: /PACKER/PKG""" class Reload: def GET(self): - pdb= json.load(open(PDB_FILE)) + f = open(PDB_FILE) + pdb= json.load(f) + f.close() return "DB reloaded" @@ -40,7 +43,9 @@ class ArchFinder: ret = pdb.get(package,{}).get(packer,False) ret = ret if ret else pdb.get(package,{}).get(super_packer,False) - if not ret: web.NotFound() + if not ret: + web.NotFound() + return "not found. i'm so sorry :(" else: return ret -- cgit v1.2.3 From 3877e5d8221d42811d376ddb560552684d34f5cc Mon Sep 17 00:00:00 2001 From: EUcancER Date: Thu, 17 Nov 2011 11:16:48 +0100 Subject: //punani: rm old punani, tightnani->punani --- punani/bin/punani | 323 +++++++------------------------------- punani/db/punani | 60 +++++++ punani/index.py | 58 +++++++ punani/tightnani/tightnani-web.py | 58 ------- punani/tightnani/tightnani_db | 60 ------- punani/tightnani/tinani | 59 ------- 6 files changed, 171 insertions(+), 447 deletions(-) create mode 100644 punani/db/punani create mode 100755 punani/index.py delete mode 100755 punani/tightnani/tightnani-web.py delete mode 100644 punani/tightnani/tightnani_db delete mode 100755 punani/tightnani/tinani diff --git a/punani/bin/punani b/punani/bin/punani index 058331f1..8caf669e 100755 --- a/punani/bin/punani +++ b/punani/bin/punani @@ -1,276 +1,59 @@ -#! /bin/sh -# -# punani - filesystem scienteer -# -# Engineering Operations -# -E -i spec insert a package to the target filesystem -# -E -r spec remove a package -# +#!/bin/bash set -euf -godmode() { - if test "${nosudo-false}" != true -a `id -u` != 0; then - echo "!! we require god mode..." >&2 - exec sudo "$0" "$@" - exit 23 # go to hell - fi -} -# return the 'system' variable -# currently be: -# arch-like -# debian-like -guess_system() -{ - if [ -f "/etc/arch-release" ] ;then - system="${system+$system, }arch-like" - fi - if [ -f "/etc/lsb-release" -o -f "/etc/debian_version" ] ;then - system="${system+$system, }debian-like" +if [ $# -ne 2 ];then + echo "usage: `basename $0` (install|remove) PACKAGE" + exit 23 +fi + +PACKERS="yum!-y install remove +brew install remove +pacman!--noconfirm -S!--needed -Rcs +bauerbill!--noconfirm -S!--needed -Rcs +yaourt!--noconfirm -S!--needed -Rcs +packer!--noconfirm -S!--needed -Rcs +apt-get!--yes install remove +aptitude!--yes install remove" + +OIFS=$IFS +PACKER= +IFS=' +' + +TIGHTNANI_HOST="http://euer.krebsco.de:9111" +# Find suitable packer +for PACKER_LINE in $PACKERS; do + TRY_PACKER_CMD="$(echo "$PACKER_LINE" | cut -d ' ' -f 1)" + TRY_PACKER="$(echo "$TRY_PACKER_CMD" | cut -d '!' -f 1)" + if which $TRY_PACKER &>/dev/null; then + PACKER=$TRY_PACKER + PACKER_CMD="$(echo "$TRY_PACKER_CMD" | tr "!" " ")" + echo "you got $PACKER" + INSTALL_PARAM="$(echo "$PACKER_LINE" | cut -d ' ' -f 2 | tr "!" " ")" + REMOVE_PARAM="$(echo "$PACKER_LINE" | cut -d ' ' -f 3 | tr "!" " ")" fi - -} - -arch_aur_helper() -{ - # pacman is the last fallback helper - manager="yaourt clyde packer bauerbill tupac pacaur paktahn pbfetch aurget aurora cower powaur pacman" - for i in $manager;do - mgr=`which $i` - if [ "$mgr" ] ;then - echo $mgr - return 0 - fi - done - echo "!! no helper found, this should never happen(tm)." - return 1 -} - -handle_system () { - case "$system" in - (*arch-like*) - # dryrun - # TODO dryrun not dry enough for aur helper - if [ "${dryrun-}" ];then - pacman () { echo "pacman $@" ; } - pkgfile () { echo "pkgfile $@"; } - yaourt () { echo "yaourt $@" ; } - fi - - # get dependencies : - # we need pkgfile - if ! [ `which pkgfile` ] ; then - pacman -S --needed --noconfirm pkgtools - pkgfile -u - fi - punani_Scientist_update() { - pacman -Sy - pkgtool -u - } - punani_Scientist_search() { - pkgfile -s -b $1 - if [ "${hard-}" ] ; then - mgr=`arch_aur_helper` - $mgr -Ss $1 - fi - - } - - punani_Engineer_insert() { - # punani under archlinux first tries to load the packages with the given file name - # it needs pkgfile for that - # - # when trying harder it tries to load the package with the given name directly via yaourt - echo "** trying to find package with given file" - pkgs=$(pkgfile -s -b -r $1 | tr "\n" "|" ) - if [ "$pkgs" ];then - echo "** found one or more packages matching, skip the ones you do not need!" - OLDIFS=$IFS - IFS='|' - for to_install in $pkgs;do - if pacman -S --needed "$to_install"; then - echo "++ finished" - fi - done - IFS=$OLDIFS - else - echo "!! nothing found in base repos" - if [ "${hard-}" ] ; then - echo "** trying harder" - echo "** trying yaourt directly with given package" - mgr=`arch_aur_helper` - if $mgr -S $1 ;then - echo "++ finished" - return 0 - else - echo "!! giving up...i am sorry" - return 1 - fi - echo - else - echo "?? When in doubt try $0 -h -Ei $1 " - fi - fi - } - punani_Engineer_remove() { - pacman -Rcs "`pacman -Ql | grep $1$ | awk '{print $1}'`" - if [ "${hard-}" ] ; then - echo "** trying harder" - echo "** directly delete given package name" - pacman -Rcs "$1" - fi - } +done +IFS=$OIFS +if [ ! "$PACKER" ];then + echo "Could not find a supported packer for you, bailing out!" + exit 23 +fi + + +# find the package name +PKG="$2" +RESOLVED=`wget -O- $TIGHTNANI_HOST/$PACKER/$PKG 2>/dev/null` +if [ ! "$RESOLVED" ];then + echo "Could not resolve your requested package, bailing out!" + exit 23 +fi +case "$1" in + install) + exec $PACKER_CMD $INSTALL_PARAM $RESOLVED ;; - (*debian-like*) - #if [ "${dryrun-}" ]; then - # apt-file () { echo $@; } - # apt-get () { echo $@; } - #fi - if ! which apt-file; then - echo "** installing dependencies: apt-file" - apt-get install --yes apt-file - echo "** update the apt-file tool" - apt-file update - fi - punani_Scientist_update() { - apt-get update - apt-file update - } - - punani_Scientist_search() { - apt-file search -l -x $1\$ && exit 0 - if [ "${hard-}" ] ; then - apt-cache search $1 - fi - } - punani_Engineer_insert() { - echo "trying to install $1" - pkgs=$(apt-file search -l -x $1\$ | tr "\n" "|" ) - if [ "$pkgs" ];then - echo "** found one or more packages matching, skip the ones you do not need!" - OLDIFS=$IFS - IFS='|' - for to_install in $pkgs;do - if apt-get install $to_install;then - echo "++ finished" - fi - done - IFS=$OLDIFS - else - if [ "${hard-}" ] ; then - echo "** trying harder" - apt-get install $1 - fi - fi - } - punani_Engineer_remove() { - apt-get remove --purge "`apt-file search -l -x /$1\$`" - if [ "${hard-}" ] ; then - echo "** trying harder" - echo "** directly delete given package name" - apt-get remove --purge "$1" - fi - } + remove) + exec $PACKER_CMD $REMOVE_PARAM $RESOLVED ;; - (*) - email='krebs@syntax-fehler.de' - irc_host='irc.freenode.org' - irc_channel='#tincspasm' -