split init scripts, update deefuzzer conf

diff --git a/tcserver/conf/etc/init.d/telecaster-audio b/tcserver/conf/etc/init.d/telecaster-audio
new file mode 100755 (executable)
index 0000000..2e1b954
--- /dev/null
+++ b/tcserver/conf/etc/init.d/telecaster-audio
@@ -0,0 +1,63 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          telecaster-audio-relay
+# Required-Start:
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: init script for the telecaster audio daemon
+### END INIT INFO
+
+
+DAEMON=deefuzzer
+USERNAME=telecaster
+CONFFILE="/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml"
+LOG=/var/log/telecaster/deefuzzer-audio-daemon.log
+PIDFILE=/var/run/telecaster-audio-relay.pid
+
+. /lib/lsb/init-functions
+
+case "$1" in
+       start)
+           log_begin_msg "Starting telecaster audio streaming relay:" "telecaster"
+            su -c "$DAEMON $CONFFILE &" $USERNAME
+            pid=`pgrep -u ${USERNAME} -f "$DAEMON $CONFFILE"`
+           if [ pid = '' ]; then
+               log_failure_msg "TeleCaster audio daemon can't be started! Check logfile: $LOG"
+            else
+                echo $pid > $PIDFILE
+           fi
+       ;;
+       stop)
+               log_begin_msg "Stopping telecaster audio streaming relay:" "telecaster"
+                pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
+               if [ ! pid = '' ]; then
+                       kill -9 $pid
+                       log_end_msg 0
+               else
+                       log_end_msg 1
+                       exit 1
+               fi
+                rm $PIDFILE
+               ;;
+       try-restart)
+               if test -e $PIDFILE ; then
+                       pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
+                       PIDDIR=/proc/$pid
+                       if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+                               $0 restart
+                               exit 0
+                       fi
+               fi
+               test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*vncserver* && $0 start
+               ;;
+
+       *)
+               log_warning_msg "Usage: /etc/init.d/telecaster {start|stop}"
+               log_warning_msg "  start - starts system-wide vncserver service"
+               log_warning_msg "  stop  - stops system-wide vncserver service"
+               exit 1
+               ;;
+esac
+
+exit 0

diff --git a/tcserver/conf/etc/init.d/telecaster-video b/tcserver/conf/etc/init.d/telecaster-video
new file mode 100755 (executable)
index 0000000..10ce28b
--- /dev/null
+++ b/tcserver/conf/etc/init.d/telecaster-video
@@ -0,0 +1,64 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          telecaster-video-relay
+# Required-Start:
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: init script for the telecaster video relay
+### END INIT INFO
+
+
+DAEMON=deefuzzer
+USERNAME=telecaster
+CONFFILE="/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml"
+LOG=/var/log/telecaster/deefuzzer-video-daemon.log
+PIDFILE=/var/run/telecaster-video-relay.pid
+
+. /lib/lsb/init-functions
+
+case "$1" in
+       start)
+           log_begin_msg "Starting telecaster video streaming relay:" "telecaster"
+            su -c "$DAEMON $CONFFILE &" $USERNAME
+            pid=`pgrep -u ${USERNAME} -f "$DAEMON $CONFFILE"`
+            echo $pid
+           if [ pid = '' ]; then
+               log_failure_msg "TeleCaster video daemon can't be started! Check logfile: $LOG"
+            else
+                echo $pid > $PIDFILE
+           fi
+       ;;
+       stop)
+               log_begin_msg "Stopping telecaster video streaming relay:" "telecaster"
+                pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
+               if [ ! pid = '' ]; then
+                        kill -9 $pid
+                       log_end_msg 0
+               else
+                       log_end_msg 1
+                       exit 1
+               fi
+                rm $PIDFILE
+               ;;
+       try-restart)
+               if test -e $PIDFILE ; then
+                       pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
+                       PIDDIR=/proc/$pid
+                       if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+                               $0 restart
+                               exit 0
+                       fi
+               fi
+               test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*vncserver* && $0 start
+               ;;
+
+       *)
+               log_warning_msg "Usage: /etc/init.d/telecaster-audio {start|stop}"
+               log_warning_msg "  start - starts system-wide vncserver service"
+               log_warning_msg "  stop  - stops system-wide vncserver service"
+               exit 1
+               ;;
+esac
+
+exit 0

diff --git a/tcserver/conf/etc/init.d/telecaster-vnc b/tcserver/conf/etc/init.d/telecaster-vnc
new file mode 100755 (executable)
index 0000000..68ea526
--- /dev/null
+++ b/tcserver/conf/etc/init.d/telecaster-vnc
@@ -0,0 +1,88 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          vncserver
+# Required-Start:
+# Required-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: init script for the audio vncserver
+### END INIT INFO
+
+
+DAEMON=/usr/bin/vncserver
+USER=
+OPTIONS=""
+LOG=/var/log/telecaster/vncserver.log
+PIDFILE=/var/run/vncserver.pid
+PORT=2
+
+test -f /etc/default/telecaster || exit 0
+. /etc/default/telecaster
+
+VNCHOME=/home/$USER
+
+if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then
+       echo "Edit /etc/default/telecaster to start telecaster vncserver"
+       exit 0
+fi
+
+test -f $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+case "$1" in
+       start)
+           log_begin_msg "Starting telecaster streaming vncserver:" "telecaster"
+            su -c "$DAEMON $OPTIONS :$PORT > $LOG &" $USER
+            sleep 10
+            #su -c "deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml > /dev/null &" $USER
+            #su -c "deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml > /dev/null &" $USER
+            pid=`pgrep -u ${USER} vncserver`
+           if [ pid = '' ]; then
+                       log_failure_msg "TeleCaster daemon can't be started! Check logfile: $LOG"
+            else
+                echo $pid > $PIDFILE
+               fi
+
+               ;;
+       stop)
+               log_begin_msg "Stopping telecaster streaming vncserver:" "telecaster"
+                pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
+               if [ ! pid = '' ]; then
+                       #su -c "pkill -9 -f \"/usr/local/bin/deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml\" " $USER
+                       #su -c "pkill -9 -f \"/usr/local/bin/deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml\" " $USER
+                    su -c "pkill -9 gst-launch-0.10" $USER
+                       sleep 1
+                        su -c "vncserver -kill :$PORT" $USER
+                       log_end_msg 0
+               else
+                       log_end_msg 1
+                       exit 1
+               fi
+                rm $PIDFILE
+               ;;
+       try-restart)
+               if test -e $PIDFILE ; then
+                       pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
+                       PIDDIR=/proc/$pid
+                       if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
+                               $0 restart
+                               exit 0
+                       fi
+               fi
+               test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*vncserver* && $0 start
+               ;;
+
+       *)
+               log_warning_msg "Usage: /etc/init.d/telecaster {start|stop|restart|force-reload|awaken|debug-run}"
+               log_warning_msg "  start - starts system-wide vncserver service"
+               log_warning_msg "  stop  - stops system-wide vncserver service"
+               log_warning_msg "  restart, force-reload - starts a new system-wide vncserver service"
+               log_warning_msg "  awaken - tell system-wide vncserver to start a poll cycle immediately"
+               log_warning_msg "  debug-run [strace [strace options...]] - start a debug run of the"
+               log_warning_msg "    system-wide vncserver service, optionally running it under strace"
+               exit 1
+               ;;
+esac
+
+exit 0

diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml
index 43038c25fda9cc44898d3395ccbe7ca30437ce4a..dbf746208a8834d5648fb975721ba9a2490a667c 100644 (file)
--- a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml
+++ b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml
@@ -1,5 +1,5 @@
 <deefuzzer>
-    <log>/var/log/telecaster/deefuzzer_mp3_safe.log</log>
+    <log>/var/log/telecaster/deefuzzer_mp3_station.log</log>
     <m3u>/var/www/m3u/telecaster_mp3.m3u</m3u>
 
     <station>
@@ -43,7 +43,7 @@
         </jingles>
         <control>
             <mode>1</mode>
-            <port>1234</port>
+            <port>16003</port>
         </control>
         <relay>
             <mode>1</mode>
@@ -96,8 +96,8 @@
             <shuffle>1</shuffle>
         </jingles>
         <control>
-            <mode>1</mode>
-            <port>1235</port>
+            <mode>0</mode>
+            <port>16004</port>
         </control>
         <relay>
             <mode>1</mode>

diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml
index b9a9be6f8ec8910065272f97e07ee22aef8da4d9..fc2b7c60d0397ebc3362807a7cb3d2365fdfbbbd 100644 (file)
--- a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml
+++ b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml
@@ -2,11 +2,11 @@
     <m3u>/var/www/m3u/telecaster_webm.m3u</m3u>
     <station>
         <control>
-            <mode>1</mode>
-            <port>1236</port>
+            <mode>0</mode>
+            <port>16005</port>
         </control>
         <relay>
-            <url>http://127.0.0.1:8080/consume/safe</url>
+            <url>http://127.0.0.1:8080/consume/monitor</url>
             <mode>1</mode>
             <author>Parisson</author>
         </relay>
@@ -56,10 +56,10 @@
     <station>
         <control>
             <mode>1</mode>
-            <port>1237</port>
+            <port>16006</port>
         </control>
         <relay>
-            <url>http://127.0.0.1:8080/consume/safe</url>
+            <url>http://127.0.0.1:8080/consume/monitor</url>
             <mode>1</mode>
             <author>Parisson</author>
         </relay>