diff options
| author | makefu <root@pigstarter.de> | 2013-02-26 12:18:52 +0000 |
|---|---|---|
| committer | makefu <root@pigstarter.de> | 2013-02-26 12:18:52 +0000 |
| commit | ef4eb3189363f5cd9a33b43693322a68d3142979 (patch) | |
| tree | 683df8268baae71451633518aa7ff7ea258a4aa8 /minikrebs/profiles/streamerkrebs/customfiles/etc/config | |
| parent | e2369060a397e8dad82a2dfcc63c81df1e08a983 (diff) | |
| parent | 001bfd5f2b6890cafd209de4ea360927d4dd8a55 (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
Conflicts:
minikrebs
Diffstat (limited to 'minikrebs/profiles/streamerkrebs/customfiles/etc/config')
| -rw-r--r-- | minikrebs/profiles/streamerkrebs/customfiles/etc/config/mjpg-streamer | 7 | ||||
| -rw-r--r-- | minikrebs/profiles/streamerkrebs/customfiles/etc/config/network | 9 |
2 files changed, 0 insertions, 16 deletions
diff --git a/minikrebs/profiles/streamerkrebs/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/streamerkrebs/customfiles/etc/config/mjpg-streamer deleted file mode 100644 index bb4f81ec..00000000 --- a/minikrebs/profiles/streamerkrebs/customfiles/etc/config/mjpg-streamer +++ /dev/null @@ -1,7 +0,0 @@ -config mjpg-streamer core - option enabled "1" - option device "/dev/video0" - option resolution "1280x1024" - option fps "5" - option www "/www/webcam" - option port "80" diff --git a/minikrebs/profiles/streamerkrebs/customfiles/etc/config/network b/minikrebs/profiles/streamerkrebs/customfiles/etc/config/network deleted file mode 100644 index c459c4e0..00000000 --- a/minikrebs/profiles/streamerkrebs/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' |