summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@krebs>2011-09-01 16:44:21 +0200
committerroot <root@krebs>2011-09-01 16:44:21 +0200
commit6f2df7825a1896ac00480fcd68345629c72386ea (patch)
tree8e9bb6153648744ef31741d35c107aa54933f4c8
parenta0f23b72769deac88e414b1cfdfdbde5882ba704 (diff)
parent57c5c973a40bf718f99c6e0fcd65b416514e2257 (diff)
Merge branch 'master' of github.com:/krebscode/painload
Conflicts: streams/stream.db
-rw-r--r--cholerab/shirts/bestellliste4
-rw-r--r--filebitch/TODO2
-rwxr-xr-xfilebitch/connect_narf.pl7
-rwxr-xr-xgod/Reaktor/index1
m---------krebsbeam/c-beam0
-rwxr-xr-xnode/tools/latest-version19
-rwxr-xr-xretiolum/scripts/adv_graphgen/parse.py3
-rwxr-xr-xretiolum/scripts/adv_graphgen/sanitize.sh13
-rw-r--r--streams/stream.db1
9 files changed, 37 insertions, 13 deletions
diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste
index f1f423e1..2c94ffe9 100644
--- a/cholerab/shirts/bestellliste
+++ b/cholerab/shirts/bestellliste
@@ -16,8 +16,8 @@ Jan 1 2 jj /* bezahlt an makefu */ Zitrone waere leckerer gewesen
Ronny 1 M jj /* bezahlt an pfleidi */
Marc 1 L --
Lotho 1 X --
-Sascha 1 X --
-Moritz 1 M --
+Sascha 1 X -j
+Moritz 1 M -j
RIPE 1 X --
kh 1 L jj gute Verarbeitung, guter Gesamteindruck, passt wie angegossen
miefda 1 L jj
diff --git a/filebitch/TODO b/filebitch/TODO
new file mode 100644
index 00000000..aa2af36a
--- /dev/null
+++ b/filebitch/TODO
@@ -0,0 +1,2 @@
+Buid a blacklist so some IPs(e.g. monitoring servers) don't trigger a beep
+
diff --git a/filebitch/connect_narf.pl b/filebitch/connect_narf.pl
index 8e984150..7c713d3b 100755
--- a/filebitch/connect_narf.pl
+++ b/filebitch/connect_narf.pl
@@ -10,9 +10,10 @@
$ip = $ARGV[0];
#I'm very sorry for this regex, but i only wanted it to get _real_ IPv4 Adresses of the log file, not any kind of timestamp bullshit
$ip =~ s/\b(25[0-5]|2[0-4][0-9]|[1]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[1]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[1]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[1]?[0-9][0-9]?)\b//g;
+if($ip ne "10.42.0.107"){
#getting some guys sitting next to the Server pissed :)
-system("morse -l 42 -f 2000 $ip");
-system("morse -l 42 -f 3000 \"connected\"");
-
+ system("morse -l 42 -f 2000 $ip");
+ system("morse -l 42 -f 3000 \"connected\"");
+}
# Uncomment the beep below to play the enterprise connect sound
# system("beep -l 42 -f 2000 -D 42 -n -l 42 -f 3337");
diff --git a/god/Reaktor/index b/god/Reaktor/index
index 6470298e..a2e6fe61 100755
--- a/god/Reaktor/index
+++ b/god/Reaktor/index
@@ -33,4 +33,5 @@ sed -i '
s/^printto *=.*/printto="'$printto'"/
' config/udp-send
+# TODO output modules: stderr, jsb-udp, remount-ro, ...
PYTHONUNBUFFERED=y $listener | tee /dev/stderr | bin/jsb-udp
diff --git a/krebsbeam/c-beam b/krebsbeam/c-beam
deleted file mode 160000
-Subproject 0072bf8f0cd3a6d0fe022c15c8957373cebef29
diff --git a/node/tools/latest-version b/node/tools/latest-version
new file mode 100755
index 00000000..b99276d5
--- /dev/null
+++ b/node/tools/latest-version
@@ -0,0 +1,19 @@
+#! /bin/sh
+#
+# //node/tools/latest-version - retrieve the latest node version from the IN
+#
+set -euf
+
+# cd //node
+cd $(readlink -f $(dirname $0)/..)
+
+# PATH prepend //util/bin
+export PATH="$PWD/../util/bin${PATH+:$PATH}"
+
+# TODO punani install executable: curl
+
+curl -fsS http://nodejs.org/ |
+ hrefs |
+ sed -n 's:.*node-v\([0-9.]\+\)\.tar\.gz:\1:p' |
+ sort |
+ tail -n 1
diff --git a/retiolum/scripts/adv_graphgen/parse.py b/retiolum/scripts/adv_graphgen/parse.py
index 4b9314cc..0bcf42a0 100755
--- a/retiolum/scripts/adv_graphgen/parse.py
+++ b/retiolum/scripts/adv_graphgen/parse.py
@@ -47,6 +47,7 @@ def write_node(k,v):
edges are weightet with the informations inside the nodes provided by
tinc
"""
+
node = " "+k+"[label=\""
node += k+"\\l"
node += "external:"+v['external-ip']+":"+v['external-port']+"\\l"
@@ -57,7 +58,7 @@ def write_node(k,v):
node +="\""
if v['external-ip'] == "MYSELF":
node += ",fillcolor=steelblue1"
- node +=",group="+v['external-ip'].replace(".","")+""
+ node +=",group=\""+v['external-ip'].replace(".","")+"\""
node += "]"
print node
diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh
index df6216fa..1dc43bf4 100755
--- a/retiolum/scripts/adv_graphgen/sanitize.sh
+++ b/retiolum/scripts/adv_graphgen/sanitize.sh
@@ -1,5 +1,6 @@
#!/bin/sh
HERE=$(dirname `readlink -f $0`)
+TMP=/tmp
GRAPH_SETTER1=dot
GRAPH_SETTER2=circo
GRAPH_SETTER3='neato -Goverlap=prism '
@@ -9,11 +10,11 @@ OPENER=/bin/true
sudo pkill -USR2 tincd
sudo sed -n '/tinc.retiolum/{s/.*tinc.retiolum\[[0-9]*\]: //gp}' $LOG_FILE |\
- $HERE/parse.py > $HERE/retiolum.dot
+ $HERE/parse.py > $TMP/retiolum.dot
-$GRAPH_SETTER1 -Tpng -o $1/retiolum_1.png $HERE/retiolum.dot
-$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $HERE/retiolum.dot
-$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $HERE/retiolum.dot
-$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $HERE/retiolum.dot
+$GRAPH_SETTER1 -Tpng -o $1/retiolum_1.png $TMP/retiolum.dot
+$GRAPH_SETTER2 -Tpng -o $1/retiolum_2.png $TMP/retiolum.dot
+$GRAPH_SETTER3 -Tpng -o $1/retiolum_3.png $TMP/retiolum.dot
+$GRAPH_SETTER4 -Tpng -o $1/retiolum_4.png $TMP/retiolum.dot
$OPENER $HERE/retiolum_1.png &>/dev/null
-rm $HERE/retiolum.dot
+rm $TMP/retiolum.dot
diff --git a/streams/stream.db b/streams/stream.db
index 47ccf7b5..5efeb9ea 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -6,4 +6,3 @@ http://somafm.com/illstreet.pls illstreet
http://localhost:8000/stream.ogg icecast
http://stream2.jungletrain.net:8000 jungletrain
http://playlist.tormentedradio.com/tormentedradio.pls tormented
-http://filebitch.shack:8000 mpd