use icecast urls

diff --git a/src/etc/cron.d/telecaster b/src/etc/cron.d/telecaster
index 300e4ecb2a092eab4c43be9ca9d6394af16da4cd..12ee6a919727118d0545f2bc853448ba7a2f8dc1 100644 (file)
--- a/src/etc/cron.d/telecaster
+++ b/src/etc/cron.d/telecaster
@@ -1,4 +1,4 @@
-30 0 * * * root /etc/init.d/telecaster stop
+0 0 * * * root /etc/init.d/telecaster stop
 0 8 * * * root /etc/init.d/telecaster start
 
 30 7 * * * root python /srv/telecaster/scripts/cleanup/rm_date_days.py 5 /home/telecaster/trash/ >> /var/log/telecaster/cleanup.log

diff --git a/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml b/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml
index df38dddf20addad7daa4121fdb24216a6159f63d..8595b33fcd75d2356e1c7169161c3062fd8835e8 100644 (file)
--- a/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml
+++ b/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml
@@ -6,7 +6,7 @@
             <port>16005</port>
         </control>
         <relay>
-            <url>http://127.0.0.1:8080/consume/monitor</url>
+            <url>http://127.0.0.1:8000/telecaster_live.webm</url>
             <mode>1</mode>
             <author>Parisson</author>
         </relay>
@@ -59,7 +59,7 @@
             <port>16006</port>
         </control>
         <relay>
-            <url>http://127.0.0.1:8080/consume/monitor</url>
+            <url>http://127.0.0.1:8000/telecaster_live.webm</url>
             <mode>1</mode>
             <author>Parisson</author>
         </relay>
@@ -80,8 +80,8 @@
         </twitter>
         <server>
             <host>127.0.0.1</host>
-            <type>stream-m</type>
-            <port>8080</port>
+            <type>icecast</type>
+            <port>8000</port>
             <sourcepassword>source2parisson</sourcepassword>
             <public>0</public>
         </server>

diff --git a/src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml b/src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml
index 8d484a199a08e3e34edd1685f7f6769f15aec93b..6a81a034540859de5e3ab183fbbbc331e4bdc425 100644 (file)
--- a/src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml
+++ b/src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml
@@ -11,7 +11,7 @@ deefuzzer:
     record: {dir: /home/telecaster/trash/webm, mode: 1}
     relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:8000/telecaster_live.webm'}
     rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://localhost/rss/'}
-    server: {host: 127.0.0.1, port: '8080', public: '0', sourcepassword: source2parisson,
+    server: {host: 127.0.0.1, port: '8000', public: '0', sourcepassword: source2parisson,
       type: icecast, mountpoint: monitor.webm}
     twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
       tags: bla bla}