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

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

1 files changed, 35 insertions, 0 deletions

diff --git a/god/streams/db/stream.db b/god/streams/db/stream.db
new file mode 100644
index 00000000..1d9b51bc
--- /dev/null
+++ b/god/streams/db/stream.db
@@ -0,0 +1,35 @@
+http://deepmix.ru/deepmix128.pls deepmix
+http://streams.xenim.de/radiotux.ogg radiotux
+http://bassdrive.com/v2/streams/BassDrive.pls bassdrive
+http://localhost:8000/stream.ogg icecast
+http://localhost:8000/shice.ogg shice
+http://stream2.jungletrain.net:8000 jungletrain
+http://playlist.tormentedradio.com/tormentedradio.pls tormented
+http://filebitch.shack:8000 mpd
+http://radio.krautchan.net:8000/radio.mp3 radiofreieskrautchan
+http://nl1.streamhosting.ch:80 lounge
+http://deluxetelevision.com/livestreams/radio/DELUXE_RADIO.pls deluxe
+http://livestream.radiodarmstadt.de:8000 darmstadt
+http://somafm.com/sxfm.pls southbysoma
+http://somafm.com/indiepop.pls indypop
+http://somafm.com/poptron.pls poptron
+http://somafm.com/480min.pls 480min
+http://somafm.com/u80s.pls underground80s
+http://somafm.com/secretagent.pls secretagent
+http://somafm.com/suburbsofgoa.pls suburbsofgoa
+http://somafm.com/beatblender.pls beatblender
+http://somafm.com/missioncontrol.pls missioncontrol
+http://somafm.com/dronezone.pls dronezone
+http://somafm.com/cliqhop.pls cliqhop
+http://somafm.com/spacestation.pls spacestationsoma
+http://somafm.com/bootliquor.pls bootliquor
+http://somafm.com/covers.pls covers
+http://somafm.com/illstreet.pls illstreet
+http://somafm.com/tags.pls tagstrip
+http://somafm.com/groovesalad.pls groove
+http://somafm.com/lush.pls lush
+http://somafm.com/digitalis.pls digitalis
+http://somafm.com/sonicuniverse.pls sonicuniverse
+http://somafm.com/doomed.pls doomed
+http://somafm.com/brfm.pls blackrockfm
+http://de.scenemusic.net/necta192.mp3 demoscene