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

Conflicts:
	god/temper/Makefile
	god/temper/collectd-temper.sh

2 files changed, 31 insertions, 0 deletions

diff --git a/minikrebs/profiles/rickroller_bare/doc/README.md b/minikrebs/profiles/rickroller_bare/doc/README.md
new file mode 100644
index 00000000..bcf721c6
--- /dev/null
+++ b/minikrebs/profiles/rickroller_bare/doc/README.md
@@ -0,0 +1,24 @@
+# Rickroller Profile
+
+The purpose of the profile is to create an access point where every connection
+is rewritten to rickroll.
+
+This is the bare profile, providing a basic installation of the rickroller but
+everything fits into the 4mb of flash memory of the krebsplug.
+
+As video autostarting is quite difficult at mobile victims to acchieve, 
+a short gif with rick dancing plus the first minute of its famous song will be
+served by the httpd.
+
+The dnsmasq will resolve every domain request to the plugs ip-address
+
+
+# Rickroll Loop
+
+8.8  --> 17.3 ; startup loop
+26.3 --> 34   ; were no strangers to love, you know the rules and so do i
+26.3 --> 42.6 ; ... gotta make you understand
+??   --> ??   ; refrain
+
+# Honorable Mentions
+http://www.finnie.org/2011/08/13/mobile-rickroll-appliance-6-0-released/
diff --git a/minikrebs/profiles/rickroller_bare/doc/videoconvert b/minikrebs/profiles/rickroller_bare/doc/videoconvert
new file mode 100644
index 00000000..e514b85a
--- /dev/null
+++ b/minikrebs/profiles/rickroller_bare/doc/videoconvert
@@ -0,0 +1,7 @@
+# To be supported by android:
+ffmpeg -i rick720p.mp4 -ss 8.8 -t 8.5 -strict -2 -s 320x240 -vcodec mpeg4 -acodec aac -ac 1 -ar 16000 -r 13 -ab 32000 -aspect 3:2 output-video.mp4
+
+
+# audio convert
+ffmpeg -i rick720p.mp4 -ss 7 -t 45 -ac 1 -ar 16000 -ab 64k -vn -acodec libvorbis rick.ogg
+ffmpeg -i rick720p.mp4 -ss 7 -t 45 -ac 1 -ar 16000 -ab 64k -vn rick.mp3