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

Conflicts:
	minikrebs

7 files changed, 0 insertions, 78 deletions

diff --git a/minikrebs/profiles/instacam/custom_make b/minikrebs/profiles/instacam/custom_make
deleted file mode 100755
index cfe965b2..00000000
--- a/minikrebs/profiles/instacam/custom_make
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-make image PROFILE=TLWR703 PACKAGES="ip kmod-ipv6 kmod-fs-ext4 wireless-tools block-mount kmod-usb-core kmod-usb2  kmod-video-uvc mjpg-streamer -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe -dnsmasq -radvd " FILES=customfiles/
diff --git a/minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer
deleted file mode 100644
index 298b06fe..00000000
--- a/minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer
+++ /dev/null
@@ -1,7 +0,0 @@
-config mjpg-streamer core
-        option enabled          "1"
-        option device           "/dev/video0"
-        option resolution       "1280x720"
-        option fps              "25"
-        option www              "/www/webcam"
-        option port             "80"
diff --git a/minikrebs/profiles/instacam/customfiles/etc/config/network b/minikrebs/profiles/instacam/customfiles/etc/config/network
deleted file mode 100644
index c459c4e0..00000000
--- a/minikrebs/profiles/instacam/customfiles/etc/config/network
+++ /dev/null
@@ -1,9 +0,0 @@
-config interface 'loopback'
-        option ifname 'lo'
-        option proto 'static'
-        option ipaddr '127.0.0.1'
-        option netmask '255.0.0.0'
-
-config interface 'lan'
-        option ifname 'eth0'
-        option proto 'dhcp'
diff --git a/minikrebs/profiles/instacam/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/instacam/customfiles/etc/dropbear/authorized_keys
deleted file mode 120000
index 9c87fc52..00000000
--- a/minikrebs/profiles/instacam/customfiles/etc/dropbear/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-/root/.ssh/authorized_keys
\ No newline at end of file
diff --git a/minikrebs/profiles/instacam/customfiles/etc/rc.local b/minikrebs/profiles/instacam/customfiles/etc/rc.local
deleted file mode 100644
index 3e91b57c..00000000
--- a/minikrebs/profiles/instacam/customfiles/etc/rc.local
+++ /dev/null
@@ -1 +0,0 @@
-insmod uvcvideo
diff --git a/minikrebs/profiles/instacam/customfiles/etc/shadow b/minikrebs/profiles/instacam/customfiles/etc/shadow
deleted file mode 100644
index 9cc800dd..00000000
--- a/minikrebs/profiles/instacam/customfiles/etc/shadow
+++ /dev/null
@@ -1,5 +0,0 @@
-root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7:::
-daemon:*:0:0:99999:7:::
-ftp:*:0:0:99999:7:::
-network:*:0:0:99999:7:::
-nobody:*:0:0:99999:7:::
diff --git a/minikrebs/profiles/instacam/doc/README.md b/minikrebs/profiles/instacam/doc/README.md
deleted file mode 100644
index b5da2ddb..00000000
--- a/minikrebs/profiles/instacam/doc/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Project Instacam
-
-# Description
-
-The aim of the project is to reliably push a video stream directly to the internets for
-everyone to see at a very low price.
-
-# Hardware
-
-## Core (Wifi / Ethernet)
-- TP-Link WR703n[Amazon](https://www.amazon.de/dp/B008UNA6FS/?tag=krebsco-21)[Ebay China](http://www.ebay.de/itm/BLUE-Mini-Nano-TP-LINK-TL-WR703N-150Mbps-WiFi-for-iPhone-4S-Wireless-Router-HOT-/360501556127?pt=COMP_EN_Routers&hash=item53ef91339f )        ~ 16 Euro
-- USB Webcam
-    - [Logitech C270 with Autofocus (AZ)](https://www.amazon.de/dp/B003PAOAWG/?tag=krebsco-21) ~ 25 Euro
-    - [China NoName Cam (DX)](http://dx.com/p/compact-1-3mp-pc-usb-webcam-with-built-in-microphone-black-51874?Utm_rid=93398939&Utm_source=affiliate)        ~ 5++ Euro
-    - [\* List of UVC Supported Devices](http://www.ideasonboard.org/uvc/ )
-    - [\* List of GSPCA Supported Devices](http://linuxtv.org/wiki/index.php/Gspca_devices)
-## 4G / 3G / UMTS
-Currently Untested:
-- usb hub ~ 4  Euro
-    - [NoName USB 2.0 Hub (DX)](http://dx.com/p/4-port-usb-2-0-hub-7980?Utm_rid=93398939&Utm_source=affiliate)
-    - [NoName USB 2.0 Hub (Ebay)](http://www.ebay.de/itm/200825754462?ssPageName=STRK:MEWNX:IT&_trksid=p3984.m1497.l2649#ht_2486wt_1366)
-- umts stick ~ 20 Euro
-- MicroSD card (optional)
-
-## Mobile Version
-either use (easy mode):
-- USB Battery Bank
-    - [Dealextreme](http://dx.com/p/rechargeable-2000mah-mobile-emergency-power-battery-with-6-adapters-66902?Utm_rid=93398939&Utm_source=affiliate)
-or (expert mode):
-- DC-DC StepDown Module
-    - [Ebay](http://www.ebay.de/itm/221162832094?ssPageName=STRK:MEWNX:IT&_trksid=p3984.m1497.l2649#ht_3092wt_1132)
-- Battery Pack
-    - take any battery pack you can find (car battery, model making)
-
-# Software
-
-## Build Firmware
-
-    git clone github.com/krebscode/painload krebs
-    cd krebs/minikrebs
-    ./prepare instacam
-    builder/init
-
-## Flash 
-
-    # flash image is at:
-    #       builder/bin/ar71xx/openwrt-ar71xx-generic-tl-wr703n-v1-squashfs-sysupgrade.bin 
-    
-    # either flash image directly via web interface or
-    # after obtaining ssh-access on the router run
-
-    OWN_IP=<<your ip>> ./upgrade <<remote ip>>