Merge branch 'master' of github.com:krebscode/painload

15 files changed, 74 insertions, 26 deletions

diff --git a/people/Makefile b/census/Makefile
index 2c6c1c03..2c6c1c03 100644
--- a/people/Makefile
+++ b/census/Makefile
diff --git a/people/README.md b/census/README.md
index e45d39c1..e45d39c1 100644
--- a/people/README.md
+++ b/census/README.md
diff --git a/people/TODO.md b/census/TODO.md
index daacfd58..daacfd58 100644
--- a/people/TODO.md
+++ b/census/TODO.md
diff --git a/people/VERSION b/census/VERSION
index 6c50e659..6c50e659 100644
--- a/people/VERSION
+++ b/census/VERSION
diff --git a/people/arping.py b/census/arping.py
index 3245f1ee..3245f1ee 100755
--- a/people/arping.py
+++ b/census/arping.py
diff --git a/people/arping_users.py b/census/arping_users.py
index f0df4924..f0df4924 100755
--- a/people/arping_users.py
+++ b/census/arping_users.py
diff --git a/people/mac_names.lst b/census/mac_names.lst
index 85fbfb25..85fbfb25 100644
--- a/people/mac_names.lst
+++ b/census/mac_names.lst
diff --git a/filebitch/COPYING b/filebitch/COPYING
new file mode 100644
index 00000000..65d1a2e9
--- /dev/null
+++ b/filebitch/COPYING
@@ -0,0 +1,14 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <momo@shackspace.de>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
diff --git a/filebitch/README b/filebitch/README
new file mode 100644
index 00000000..177bb374
--- /dev/null
+++ b/filebitch/README
@@ -0,0 +1,12 @@
+The connec_sh script morses the IP + "connected" when a user connects to filebitchs proftpd server. 
+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
+<IfModule mod_exec.c>
+    ExecEngine on
+    ExecOnConnect "/krebs/filebitch/connect_narf.pl"
+</IfModule>
+
diff --git a/filebitch/connect_narf.pl b/filebitch/connect_narf.pl
new file mode 100644
index 00000000..87a521ed
--- /dev/null
+++ b/filebitch/connect_narf.pl
@@ -0,0 +1,15 @@
+#!/usr/bin/perl
+#Please add the following to your proftpd config file 
+#ExtendedLog     /var/log/proftpd/ftp_auth.log AUTH auth
+#and
+#<IfModule mod_exec.c>
+#    ExecEngine on
+#    ExecOnConnect "/krebs/filebitch/connect_narf.pl"
+#</IfModule>
+
+$ip = system("tail -n 1 /var/log/proftpd/ftp_auth.log");
+#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;
+#getting some guys sitting next to the Server pissed :)
+system("morse -l 42 -f 2000 $ip");
+system("morse -l 42 -f 3000 connected");
diff --git a/kachelmann/.conditions.swp b/kachelmann/.conditions.swp
deleted file mode 100644
index a7b2f79d..00000000
--- a/kachelmann/.conditions.swp
+++ /dev/null
diff --git a/kachelmann/changes b/kachelmann/changes
index dfd22b64..1875dabd 100644
--- a/kachelmann/changes
+++ b/kachelmann/changes
@@ -1,31 +1,24 @@
 #!/usr/bin/perl
 use XML::Simple;
 my $xml = new XML::Simple;
+my $xml_store = undef;
 my $data_new = undef;
 my $data_old = undef;
+my $condition_store = undef;
 
 
-&startup;
-while (true) {
-    if($status_new != $status_old){
-        system("espeak -v de \"Das Wetter hat sich von $status_old in $status_new verändert\"");
+my $data_old = $condition_store;
+while (1) {
+    &xml_update();
+    $data_new = $condition_store;
+    if($data_new == $data_old){
+        system("espeak Das Wetter hat sich von $data_old in $data_new verändert");
     }
-    sleep(300);
-    &get_status;
+    sleep 300;
+    $data_new = $data_old;
 }
-
-
-# The startup sub is used to get the first weather state. it should only be used on startup. sorry.
-sub startup(){
-    system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml");
-    $data_new = $xml->XMLin("/tmp/kachelmann/weather.xml");
-    $data_new = $data_new->{weather}->{current_conditions}->{condition}->{data};
-}
-
-# The get_status sub moves the current data to $data_old and then gets a new one from Googles API
-sub get_status(){
-    system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml");
-    $data_old = $data_new;
-    $data_new = $xml->XMLin("/tmp/kachelmann/weather.xml");
-    $data_new = $data_new->{weather}->{current_conditions}->{condition}->{data};
+sub xml_update(){
+    $xml_store = system("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}; 
 }
diff --git a/retiolum/Makefile b/retiolum/Makefile
index 0d99ee70..85020c9f 100644
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -1,6 +1,7 @@
 .phony: update it all so install
 
-all: select-target
+all: 
+	cat Makefile
 
 it: so
 so: it
@@ -8,8 +9,20 @@ so: it
 /etc/tinc/retiolum/hosts:
 	cd $(dir $@) && git clone https://github.com/krebscode/hosts
 
+#TODO conflicting 
 update: /etc/tinc/retiolum/hosts
 	cd $< && git pull
 
-install:
+install: 
 	scripts/tinc_setup/install.sh
+
+autohosts: 
+	@echo creating Magic
+	bin/update_tinc_hosts "create magic" || true
+	@echo adding hosts
+	bin/update_tinc_hosts restart
+
+arch-install: update install arch-autostart autohosts
+
+arch-autostart:
+	make -C scripts/autostart arch
diff --git a/retiolum/scripts/adv_graphgen/parse.py b/retiolum/scripts/adv_graphgen/parse.py
index 9c2dd051..0744b262 100755
--- a/retiolum/scripts/adv_graphgen/parse.py
+++ b/retiolum/scripts/adv_graphgen/parse.py
@@ -57,6 +57,7 @@ def write_node(k,v):
   node +="\""
   if v['external-ip'] == "MYSELF":
     node += ",fillcolor=steelblue1"
+  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 2febc54c..38281fba 100755
--- a/retiolum/scripts/adv_graphgen/sanitize.sh
+++ b/retiolum/scripts/adv_graphgen/sanitize.sh
@@ -1,7 +1,7 @@
 GRAPH_SETTER1=dot
 GRAPH_SETTER2=circo
-GRAPH_SETTER3=neato
-GRAPH_SETTER3=sfdp
+GRAPH_SETTER3='neato -Goverlap=prism '
+GRAPH_SETTER4=sfdp
 LOG_FILE=/var/log/everything.log
 OPENER=/bin/true
 
@@ -14,4 +14,4 @@ $GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot
 $GRAPH_SETTER3 -Tpng -o $1retiolum_3.png retiolum.dot
 $GRAPH_SETTER4 -Tpng -o $1retiolum_4.png retiolum.dot
 $OPENER retiolum_1.png &>/dev/null 
-#rm retiolum.dot
+rm retiolum.dot