summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEUcancER <root@euer.krebsco.de>2011-09-01 12:41:53 +0200
committerEUcancER <root@euer.krebsco.de>2011-09-01 12:41:53 +0200
commit57c5c973a40bf718f99c6e0fcd65b416514e2257 (patch)
tree8e9bb6153648744ef31741d35c107aa54933f4c8
parent37491fdc8cdb5349ab0377d3e528231d0cffe07a (diff)
parent63df68949c64bf652c287bda51f7175c64776ad9 (diff)
Merge branch 'master' of github.com:krebscode/painload
i hope everything is fine now Conflicts: .gitmodules
-rw-r--r--cholerab/shirts/bestellliste4
-rw-r--r--filebitch/TODO2
-rwxr-xr-xfilebitch/connect_narf.pl7
3 files changed, 8 insertions, 5 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");