From 6afd4823788738dc15835a30339c7f588abaedf2 Mon Sep 17 00:00:00 2001 From: Momo Date: Tue, 16 Aug 2011 22:14:19 +0200 Subject: Added IP f00 --- filebitch/connect_narf.pl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/filebitch/connect_narf.pl b/filebitch/connect_narf.pl index fd2742dc..97cc7750 100755 --- a/filebitch/connect_narf.pl +++ b/filebitch/connect_narf.pl @@ -4,12 +4,15 @@ #and # # ExecEngine on -# ExecOnConnect "/krebs/filebitch/connect_narf.pl" +# ExecOnConnect "/krebs/filebitch/connect_narf.pli %a" # -#$ip = system("tail -n 1 /var/log/proftpd/ftp_auth.log"); +$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]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b//g; +$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; #getting some guys sitting next to the Server pissed :) -my $ip = "USER"; -system("beep -l 42 -f 2000 -D 42 -n -l 42 -f 3337"); +system("morse -l 42 -f 2000 $ip"); +system("morse -l 42 -f 3000 \"connected\""); + +# my $ip = "USER"; +# system("beep -l 42 -f 2000 -D 42 -n -l 42 -f 3337"); -- cgit v1.2.3 From ff4808b6b9a7ab1dc6711c01e3c385eda78a241d Mon Sep 17 00:00:00 2001 From: Momo Date: Thu, 18 Aug 2011 04:17:17 +0200 Subject: Fixed the READMES and disconnect_narf.pl --- filebitch/README | 8 +++++--- filebitch/connect_narf.pl | 2 +- filebitch/disconnect_narf.pl | 15 ++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/filebitch/README b/filebitch/README index 177bb374..5ae3a666 100644 --- a/filebitch/README +++ b/filebitch/README @@ -1,12 +1,14 @@ -The connec_sh script morses the IP + "connected" when a user connects to filebitchs proftpd server. +The connect_narf.pl script morses the IP + "connected" when a user connects to filebitchs proftpd server. +The disconnect_narf.pl scritp will do the obvious opposite. It will hopefully drive someone crazy. To make it run you need to add some lines to your proftpd config. I decided not to let Krebs do this as I didn't want to break your FTP Server (I know FTP is broken by default). The 5 necessary lines are: -ExtendedLog /var/log/proftpd/ftp_auth.log AUTH auth + ExecEngine on - ExecOnConnect "/krebs/filebitch/connect_narf.pl" + ExecOnConnect "/krebs/filebitch/connect_narf.pl %a" + ExecOnExit "/krebs/filebitch/disconnect_narf.pl %a" diff --git a/filebitch/connect_narf.pl b/filebitch/connect_narf.pl index 97cc7750..8e984150 100755 --- a/filebitch/connect_narf.pl +++ b/filebitch/connect_narf.pl @@ -14,5 +14,5 @@ $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] system("morse -l 42 -f 2000 $ip"); system("morse -l 42 -f 3000 \"connected\""); -# my $ip = "USER"; +# 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/filebitch/disconnect_narf.pl b/filebitch/disconnect_narf.pl index af7bea6c..77fbf743 100755 --- a/filebitch/disconnect_narf.pl +++ b/filebitch/disconnect_narf.pl @@ -1,15 +1,16 @@ #!/usr/bin/perl #Please add the following to your proftpd config file -#ExtendedLog /var/log/proftpd/ftp_auth.log AUTH auth -#and # # ExecEngine on -# ExecOnExit "/krebs/filebitch/disconnect_narf.pl" +# ExecOnExit "/krebs/filebitch/connect_narf.pli %a" # -#$ip = system("tail -n 1 /var/log/proftpd/ftp_auth.log"); +$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]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b//g; +$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; #getting some guys sitting next to the Server pissed :) -my $ip = "USER"; -system("beep -l 42 -f 2000 -D 42 -n -l 42 -f 1000"); +system("morse -l 42 -f 2000 $ip"); +system("morse -l 42 -f 3000 \"disconnected\""); + +# Uncomment the beep below to play the enterprise connect sound +# system("beep -l 42 -f 2000 -D 42 -n -l 42 -f 3337"); -- cgit v1.2.3 From 176407e63801e8681608d0bf0ebfe6bb809c56b9 Mon Sep 17 00:00:00 2001 From: Momo Date: Fri, 19 Aug 2011 18:23:20 +0200 Subject: Workz nau biatches --- kachelmann/changes | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 kachelmann/changes diff --git a/kachelmann/changes b/kachelmann/changes old mode 100644 new mode 100755 index 1875dabd..d2f1c740 --- a/kachelmann/changes +++ b/kachelmann/changes @@ -10,15 +10,15 @@ my $condition_store = undef; my $data_old = $condition_store; while (1) { &xml_update(); + $data_old = $data_new; $data_new = $condition_store; - if($data_new == $data_old){ - system("espeak Das Wetter hat sich von $data_old in $data_new verändert"); + if($data_new ne $data_old){ + system("espeak \"Das Wetter hat sich von $data_old in $data_new verändert\n\"); } sleep 300; - $data_new = $data_old; } sub xml_update(){ - $xml_store = system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\""); + $xml_store = `w3m -dump "http://www.google.com/ig/api?weather=70327-stuttgart&hl=de"`; $xml_store = $xml->XMLin($xml_store); $condition_store = $xml_store->{weather}->{current_conditions}->{condition}->{data}; } -- cgit v1.2.3 From 95f12b7f3aeaf4577d8a1415c0dca07a1e62bb13 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 19 Aug 2011 18:20:28 +0200 Subject: minor bug fix --- kachelmann/changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kachelmann/changes b/kachelmann/changes index d2f1c740..22116967 100755 --- a/kachelmann/changes +++ b/kachelmann/changes @@ -13,7 +13,7 @@ while (1) { $data_old = $data_new; $data_new = $condition_store; if($data_new ne $data_old){ - system("espeak \"Das Wetter hat sich von $data_old in $data_new verändert\n\"); + system("espeak \"Das Wetter hat sich von $data_old in $data_new verändert\n\""); } sleep 300; } -- cgit v1.2.3