Added some Radio Streams for MPFire

Added Reload function to apache init script
Changed the packages to use reload instead of restart

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@997 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/mpfire/webradio b/config/mpfire/webradio
index dbd8b1fe3fb13412419642fb6e428b5efe050d41..f8f1a5d1afc45c2f521a71b645a76a3441a92b48 100644 (file)
--- a/config/mpfire/webradio
+++ b/config/mpfire/webradio
@@ -1,10 +1,57 @@
-62.75.176.45/rtl-high|89.0 RTL Hitradio|http://www.89.0rtl.de
-gffstream.ic.llnwd.net/stream/gffstream_stream_wdr_einslive_b|Einslive|http://www.einslive.de/
-213.186.41.149:8040|Deepinside Radio European|http://www.deepinside.co.uk
-62.75.176.40:80/bigfm-cbr-128|BigFM|http://www.bigfm.de
-62.75.176.44/brocken-high|Hit-Radio Brocken|http://www.radiobrocken.de
-87.118.100.135:9191|Spaceworld Radio|http://spaceworld-radio.de/
-dsl.blackbeats.fm:13000|BlackBeats FM|http://www.blackbeats.fm
-87.118.64.197:3100|Discofox-Radio|http://www.discofox-radio.de
-rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/
-relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com
+62.75.176.45/rtl-high|89.0 RTL Hitradio|http://www.89.0rtl.de\r
+gffstream.ic.llnwd.net/stream/gffstream_stream_wdr_einslive_b|Einslive|http://www.einslive.de/\r
+213.186.41.149:8040|Deepinside Radio European|http://www.deepinside.co.uk\r
+62.75.176.40:80/bigfm-cbr-128|BigFM|http://www.bigfm.de\r
+62.75.176.44/brocken-high|Hit-Radio Brocken|http://www.radiobrocken.de\r
+87.118.100.135:9191|Spaceworld Radio|http://spaceworld-radio.de/\r
+dsl.blackbeats.fm:13000|BlackBeats FM|http://www.blackbeats.fm\r
+87.118.64.197:3100|Discofox-Radio|http://www.discofox-radio.de\r
+rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/\r
+relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com\r
+relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/\r
+www.scenemusic.eu:8002/high.ogg|Nectarine 100% Demoscene Radio|http://www.scenemusic.eu/\r
+radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/\r
+160.79.128.40:7234|DI.FM Future Pop|http://www.di.fm\r
+scfire-ntc-aa03.stream.aol.com:80/stream/1003|DI.FM Trance|http://www.di.fm\r
+scfire-ntc-aa04.stream.aol.com:80/stream/1065|DI.FM Vocal Trance|http://www.di.fm\r
+scfire-nyk-aa03.stream.aol.com:80/stream/1035|DI.FM Chillout|http://www.di.fm\r
+scfire-nyk-aa03.stream.aol.com:80/stream/1024|DI.FM Euro Dance|http://www.di.fm\r
+scfire-nyk-aa04.stream.aol.com:80/stream/1007|DI.FM House|http://www.di.fm\r
+205.188.215.232:8016|DI.FM Soulfull House|http://www.di.fm\r
+scfire-chi-aa02.stream.aol.com:80/stream/1025|DI.FM Hard Dance|http://www.di.fm\r
+66.250.45.118:7204|DI.FM Techno|http://www.di.fm\r
+scfire-ntc-aa02.stream.aol.com:80/stream/1026|DI.FM Progressive|http://www.di.fm\r
+scfire-ntc-aa03.stream.aol.com:80/stream/1008|DI.FM Goa-Psy Trance|http://www.di.fm\r
+scfire-ntc-aa04.stream.aol.com:80/stream/1004|DI.FM Hardcore|http://www.di.fm\r
+209.247.146.100:8000|DI.FM DJ Mixes|http://www.di.fm\r
+scfire-ntc-aa03.stream.aol.com:80/stream/1009|DI.FM Lounge|http://www.di.fm\r
+207.200.96.229:8030|DI.FM Drum 'n' Bass|http://www.di.fm\r
+205.188.215.225:8004|DI.FM Classic Electronica|http://www.di.fm\r
+205.188.215.228:8006|DI.FM Ambient|http://www.di.fm\r
+205.188.215.225:8002|DI.FM Breaks|http://www.di.fm\r
+205.188.215.226:8006|DI.FM Gabber|http://www.di.fm\r
+160.79.128.40:7794|SKY.FM Solo Piano|http://www.sky.fm\r
+160.79.128.40:7814|SKY.FM Piano Jazz|http://www.sky.fm\r
+160.79.128.40:7804|SKY.FM Bossa Nova Jazz|http://www.sky.fm\r
+160.79.128.40:7774|SKY.FM Simply Soundtracks|http://www.sky.fm\r
+160.79.128.40:7784|SKY.FM Contemporary Christian|http://www.sky.fm\r
+scfire-chi-aa04.stream.aol.com:80/stream/1010|SKY.FM Smooth Jazz|http://www.sky.fm\r
+160.79.128.61:7714|SKY.FM Uptempo Smooth Jazz|http://www.sky.fm\r
+scfire-chi-aa01.stream.aol.com:80/stream/1014|SKY.FM Top Hits!|http://www.sky.fm\r
+scfire-ntc-aa03.stream.aol.com:80/stream/1013|SKY.FM Best of the 80's|http://www.sky.fm\r
+scfire-chi-aa04.stream.aol.com:80/stream/1076|SKY.FM All Hit 70's|http://www.sky.fm\r
+160.79.128.61:7684|SKY.FM Oldies|http://www.sky.fm\r
+scfire-dll-aa03.stream.aol.com:80/stream/1006|SKY.FM Mostly Classical|http://www.sky.fm\r
+205.188.215.226:8020|SKY.FM Classical Guitar|http://www.sky.fm\r
+scfire-nyk-aa04.stream.aol.com:80/stream/1002|SKY.FM New Age|http://www.sky.fm\r
+160.79.128.61:7674|SKY.FM World Music|http://www.sky.fm\r
+scfire-nyk-aa04.stream.aol.com:80/stream/1017|SKY.FM Roots Reggae|http://www.sky.fm\r
+38.119.49.140:8030|SKY.FM DaTempo Lounge|http://www.sky.fm\r
+scfire-chi-aa02.stream.aol.com:80/stream/1019|SKY.FM Country|http://www.sky.fm\r
+160.79.128.40:7734|SKY.FM Classic Rock|http://www.sky.fm\r
+160.79.128.40:7754|SKY.FM Alternative Rock|http://www.sky.fm\r
+66.135.38.32:8000|SKY.FM Urban Jamz|http://www.sky.fm\r
+160.79.128.61:7694|SKY.FM Classic Rap|http://www.sky.fm\r
+160.79.128.61:7724|SKY.FM Indie Rock|http://www.sky.fm\r
+205.188.215.231:8010|SKY.FM Salsa|http://www.sky.fm\r
+205.188.215.227:8008|SKY.FM Modern Jazz|http://www.sky.fm\r

diff --git a/src/initscripts/init.d/apache b/src/initscripts/init.d/apache
index 9e9a6ddb53955f208c3fc6241077506a672643cc..4c73a7fd7edb77a161d309250136819894794060 100644 (file)
--- a/src/initscripts/init.d/apache
+++ b/src/initscripts/init.d/apache
@@ -30,6 +30,12 @@ case "$1" in
                /usr/sbin/apachectl -k restart
                evaluate_retval
                ;;
                /usr/sbin/apachectl -k restart
                evaluate_retval
                ;;

+               
+       reload)
+               boot_mesg "Reloading Apache daemon..."
+               /usr/sbin/apachectl -k graceful
+               evaluate_retval
+               ;;

 
        status)
                statusproc /usr/sbin/httpd
 
        status)
                statusproc /usr/sbin/httpd

diff --git a/src/paks/applejuice/install.sh b/src/paks/applejuice/install.sh
index d4d74768765acafc87232a50c2f1818b04578f47..ebc97ce25e88df089503d3277fb50a4c7de36bb1 100644 (file)
--- a/src/paks/applejuice/install.sh
+++ b/src/paks/applejuice/install.sh
@@ -9,4 +9,4 @@ ln -svf ../init.d/applejuice /etc/rc.d/rc0.d/K05applejuice
 ln -svf ../init.d/applejuice /etc/rc.d/rc3.d/S98applejuice
 ln -svf ../init.d/applejuice /etc/rc.d/rc6.d/K05applejuice
 
 ln -svf ../init.d/applejuice /etc/rc.d/rc3.d/S98applejuice
 ln -svf ../init.d/applejuice /etc/rc.d/rc6.d/K05applejuice
 

-/etc/init.d/apache restart
+/etc/init.d/apache reload 

diff --git a/src/paks/openmailadmin/install.sh b/src/paks/openmailadmin/install.sh
index 1b6f8c31dc3f262a561aae50b2f199c4b48877ff..c4500dea0b428513e4ec5d0025c60123c38bd1ce 100644 (file)
--- a/src/paks/openmailadmin/install.sh
+++ b/src/paks/openmailadmin/install.sh
@@ -5,4 +5,4 @@ extract_files
 
 mysql < /srv/web/openmailadmin/mail.dump
 
 
 mysql < /srv/web/openmailadmin/mail.dump
 

-/etc/init.d/apache restart
+/etc/init.d/apache reload