From: yomguy <>
Date: Thu, 8 Jul 2010 17:42:42 +0000 (+0000)
Subject: fix vncserver for RT priorities, fix deefuzzer PB conf, start edcast
X-Git-Tag: 0.9~243
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7f37a876c44a8ae1f93d4f85998a5f0bf6af7c43;p=telecaster-client.git
fix vncserver for RT priorities, fix deefuzzer PB conf, start edcast
with fluxbox in vncserver
---
diff --git a/conf/etc/init.d/vncserver b/conf/etc/init.d/vncserver
index 24bdff1..60113f0 100755
--- a/conf/etc/init.d/vncserver
+++ b/conf/etc/init.d/vncserver
@@ -1,38 +1,24 @@
#!/bin/sh
-#
-# VNCserver init script
-#
### BEGIN INIT INFO
# Provides: vncserver
-# Required-Start: $network $local_fs $remote_fs
# Required-Stop:
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: init-Script for system wide fetchmail daemon
+# Short-Description: init script for vncserver with RT capabilities
### END INIT INFO
-#
-# A fetchmailrc file containg hosts and passwords for all local users should be
-# placed in /etc/fetchmailrc. Remember to make the /etc/fetchmailrc mode 600
-# to avoid disclosing the users' passwords.
-#
-# This script will NOT start or stop fetchmail if the /etc/fetchmailrc file
-# does not exist or /etc/default/fetchmail is set to no.
-# Defaults
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
+
DAEMON=/usr/bin/vncserver
USER=
-PORT=
OPTIONS=""
-
-. /lib/lsb/init-functions
+LOG=/var/log/vncserver.log
+PIDFILE=/var/run/vncserver.pid
+PORT=1
test -f /etc/default/vncserver || exit 0
. /etc/default/vncserver
-OPTIONS="$OPTIONS"
-
-PIDFILE="/var/run/vncserver.pid"
+VNCHOME=/home/$USER
if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then
echo "Edit /etc/default/vncserver to start vncserver"
@@ -41,59 +27,34 @@ fi
test -f $DAEMON || exit 0
-set -e
+. /lib/lsb/init-functions
case "$1" in
- start)
- 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
- log_failure_msg "vncserver already started; not starting."
- exit 0
- else
- log_warning_msg "Removing stale PID file $PIDFILE."
- rm -f $PIDFILE
- fi
- fi
+ start)
log_begin_msg "Starting vncserver audio server:" "vncserver"
- if start-stop-daemon -m -b -S -o -q -p $PIDFILE -x $DAEMON -u $USER -c $USER -a $DAEMON -- $OPTIONS :$PORT; then
- log_end_msg 0
- else
- log_end_msg 1
- exit 1
- fi
+ echo $DAEMON $OPTIONS :$PORT' &' > $VNCHOME/.vncserverinit
+ chmod +x $VNCHOME/.vncserverinit
+ su -c $VNCHOME/.vncserverinit $USER > ${LOG}
+ sleep 2
+ pid=`pgrep -u ${USER} vncserver`
+ if [ pid = '' ]; then
+ log_failure_msg "Vncserver daemon can't be started! Check logfile: ${LOG}"
+ else
+ echo $pid > $PIDFILE
+ fi
+
;;
stop)
- if ! test -e $PIDFILE ; then
- log_failure_msg "Pidfile not found! Is vncserver running?"
- exit 0
- fi
- log_begin_msg "Stopping vncserver:" "vncserver"
- if start-stop-daemon -m -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then
- $DAEMON -kill :$PORT
- rm -f $PIDFILE
- log_end_msg 0
- else
- rm -f $PIDFILE
- log_end_msg 1
- exit 1
- fi
- ;;
- force-reload|restart)
- log_begin_msg "Restarting vncserver:" "vncserver"
- if ! start-stop-daemon -m -K -o -q -p $PIDFILE -x $DAEMON -u $USER; then
- log_end_msg 1
- exit 1
- fi
- sleep 1
- rm -f $PIDFILE || true
- if start-stop-daemon -m -b -S -o -q -p $PIDFILE -x $DAEMON -u $USER -c $USER -a $DAEMON -- $OPTIONS; then
- log_end_msg 0
- else
- log_end_msg 1
- exit 1
- fi
+ log_begin_msg "Stopping vncserver audio server:" "vncserver"
+ pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1`
+ if [ ! pid = '' ]; then
+ vncserver -kill :$PORT
+ log_end_msg 0
+ else
+ log_end_msg 1
+ exit 1
+ fi
+ rm $PIDFILE
;;
try-restart)
if test -e $PIDFILE ; then
@@ -106,17 +67,7 @@ case "$1" in
fi
test -f /etc/rc`/sbin/runlevel | cut -d' ' -f2`.d/S*vncserver* && $0 start
;;
- awaken)
- log_begin_msg "Awakening vncserver:" "vncserver"
- if [ -s $PIDFILE ]; then
- start-stop-daemon -K -s 10 -q -p $PIDFILE -x $DAEMON
- log_end_msg 0
- exit 0
- else
- log_end_msg 1
- exit 1
- fi
- ;;
+
*)
log_warning_msg "Usage: /etc/init.d/vncserver {start|stop|restart|force-reload|awaken|debug-run}"
log_warning_msg " start - starts system-wide vncserver service"
diff --git a/conf/etc/telecaster/deefuzzer.xml b/conf/etc/telecaster/deefuzzer.xml
index eb607c1..db1b3ba 100644
--- a/conf/etc/telecaster/deefuzzer.xml
+++ b/conf/etc/telecaster/deefuzzer.xml
@@ -1,32 +1,33 @@
- /var/log/deefuzzer/deefuzzer.log
- /var/www/m3u/deefuzzer.m3u
+ /var/log/deefuzzer/preb.log
+ /var/www/m3u/preb.m3u
+
- TeleCaster
- TeleCaster Live Session
- LIVE Talk and Music
- http://parisson.com
- Various Funk Groove
+ telecaster_04
+ TeleCaster #4
+ TeleCaster testing
+ http://crfpa.pre-barreau.com
+ School
- parisson.com
+ stream.parisson.com
8000
source2parisson
0
- /path/to/mp3/
+ /home/prebarreau/media/CRFPA/2009/
mp3
- 192
+ 96
7
44100
- 1
+ 2
1
- /var/www/rss/
- 1
+ /var/www/rss
+ 0
0
@@ -44,7 +45,7 @@
1234
- 0
+ 1
http://localhost:8000/telecaster_live.mp3
@@ -52,6 +53,7 @@
/path/to/archives
+
diff --git a/conf/etc/telecaster/telecaster.xml b/conf/etc/telecaster/telecaster.xml
index d6846fe..253fba8 100644
--- a/conf/etc/telecaster/telecaster.xml
+++ b/conf/etc/telecaster/telecaster.xml
@@ -1,38 +1,34 @@
- yomix
- Yomix Streams
- My streams
- http://wm16.parisson.org
- Other
+ Pre-Barreau
+ Pre-Barreau
+ La preparation au Barreau de Paris
+ http:///telecaster-04.parisson.com
+ Vocal
- parisson.com
+ stream.parisson.com
8000
source2parisson
0
/etc/telecaster/deefuzzer.xml
- lock/telecaster.lock
/var/www/rss/
true
- /home/momo/mymusic/telecaster/media
- /home/momo/mymusic/telecaster/backup
+ /home/pre-barreau/media/CRFPA
+ /home/pre-barreau/backup
mp3
- 256
- 2
- 8
+ 96
+ 1
+ 3
44100
- system:capture_1
-
-
- system:capture_2
+ jack_rack:out_1
diff --git a/conf/home/fluxbox/autostart.sh b/conf/home/fluxbox/autostart.sh
index 0f0f367..7025b33 100755
--- a/conf/home/fluxbox/autostart.sh
+++ b/conf/home/fluxbox/autostart.sh
@@ -14,3 +14,17 @@ fi
qjackctl &
+edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack &
+sleep 3
+
+# MONO setup
+jack_disconnect jack_rack:out_2 LIVE:in_2
+jack_connect jack_rack:out_1 LIVE:in_1
+jack_connect jack_rack:out_1 LIVE:in_2
+
+# STEREO setup
+#jack_connect jack_rack:out_1 LIVE:in_1
+#jack_connect jack_rack:out_2 LIVE:in_2
+
+
+