From a477eb7ae37918f00564e878e7a8fdf6b6578a3e Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 8 Dec 2014 14:29:35 +0100 Subject: [PATCH] re-arrange, cleanup --- .gitignore | 3 + README.rst | 8 +- __init__.py | 4 - conf/etc/init.d/telecaster | 92 +++++++++--------- conf/etc/init.d/telecaster-audio | 63 ------------ conf/etc/init.d/telecaster-video | 63 ------------ conf/etc/init.d/telecaster-vnc | 89 ----------------- .../.fluxbox}/autostart.sh | 0 .../{fluxbox => telecaster/.fluxbox}/init | 0 .../.fluxbox}/init.ubuntu | 0 .../.fluxbox}/scripts/monitor_check.py | 0 .../.fluxbox}/scripts/tc_audio_mp3_icecast.sh | 0 .../scripts/tc_video_simple_webm_stream.sh | 0 .../.fluxbox/scripts}/telecaster-restart-full | 0 .../.fluxbox}/startup.ubuntu | 0 conf/home/{vnc => telecaster/.vnc}/xstartup | 0 .../telecaster/media/mp3/silence.mp3 | Bin .../telecaster/media/ogg/silence.ogg | Bin conf/usr/local/bin/telecaster-restart | 16 --- doc/compile_gst.txt | 19 ++++ install.py | 24 +++-- media/silence_mono.mp3 | Bin 122880 -> 0 bytes media/silence_mono.ogg | Bin 4900 -> 0 bytes setup.py | 28 ------ 24 files changed, 86 insertions(+), 323 deletions(-) delete mode 100644 __init__.py delete mode 100755 conf/etc/init.d/telecaster-audio delete mode 100755 conf/etc/init.d/telecaster-video delete mode 100755 conf/etc/init.d/telecaster-vnc rename conf/home/{fluxbox => telecaster/.fluxbox}/autostart.sh (100%) rename conf/home/{fluxbox => telecaster/.fluxbox}/init (100%) rename conf/home/{fluxbox => telecaster/.fluxbox}/init.ubuntu (100%) rename conf/{usr/local/share/telecaster => home/telecaster/.fluxbox}/scripts/monitor_check.py (100%) rename conf/{usr/local/share/telecaster => home/telecaster/.fluxbox}/scripts/tc_audio_mp3_icecast.sh (100%) rename conf/{usr/local/share/telecaster => home/telecaster/.fluxbox}/scripts/tc_video_simple_webm_stream.sh (100%) rename conf/{usr/local/bin => home/telecaster/.fluxbox/scripts}/telecaster-restart-full (100%) rename conf/home/{fluxbox => telecaster/.fluxbox}/startup.ubuntu (100%) rename conf/home/{vnc => telecaster/.vnc}/xstartup (100%) rename conf/{usr/local/share => home}/telecaster/media/mp3/silence.mp3 (100%) rename conf/{usr/local/share => home}/telecaster/media/ogg/silence.ogg (100%) delete mode 100755 conf/usr/local/bin/telecaster-restart create mode 100644 doc/compile_gst.txt delete mode 100644 media/silence_mono.mp3 delete mode 100644 media/silence_mono.ogg delete mode 100644 setup.py diff --git a/.gitignore b/.gitignore index 2f78cf5..eec5c21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ *.pyc +build +dist +*.egg diff --git a/README.rst b/README.rst index 3211dde..78b2c91 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,13 @@ +TeleCaster Server + +Live audio and video recording and streaming system based on Gstreamer, JACK, Vncserver and Fluxbox + Features ======== * Recording and streaming formats : MP3 and OGG Vorbis, WebM * Autonomous VNC and JACK sessions for safe monitoring and streaming - * Provides all configuration files for Debian like systems + * Provides all configuration files for Debian like systems License ======= @@ -14,5 +18,3 @@ Author ====== Guillaume Pellerin - - diff --git a/__init__.py b/__init__.py deleted file mode 100644 index bc5de50..0000000 --- a/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ - -__version__ = 0.6 - -from install import * diff --git a/conf/etc/init.d/telecaster b/conf/etc/init.d/telecaster index 412789c..ffd7fe9 100755 --- a/conf/etc/init.d/telecaster +++ b/conf/etc/init.d/telecaster @@ -13,7 +13,7 @@ DAEMON=/usr/bin/vncserver USER= OPTIONS="" LOG=/var/log/telecaster/vncserver.log -PIDFILE=/var/run/vncserver.pid +PIDFILE=/var/run/telecaster.pid PORT=2 test -f /etc/default/telecaster || exit 0 @@ -22,8 +22,8 @@ test -f /etc/default/telecaster || exit 0 VNCHOME=/home/$USER if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then - echo "Edit /etc/default/telecaster to start telecaster vncserver" - exit 0 + echo "Edit /etc/default/telecaster to start telecaster vncserver" + exit 0 fi test -f $DAEMON || exit 0 @@ -31,59 +31,57 @@ test -f $DAEMON || exit 0 . /lib/lsb/init-functions case "$1" in - start) - log_begin_msg "Starting telecaster streaming vncserver:" "telecaster" + 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" + if [ pid = '' ]; then + log_failure_msg "TeleCaster daemon can't be started! Check logfile: $LOG" else echo $pid > $PIDFILE - fi + fi - ;; - stop) - log_begin_msg "Stopping telecaster streaming vncserver:" "telecaster" + ;; + 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 \"python /usr/local/share/telecaster/scripts/monitor_check.py\" " - su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml\" " - su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml\" " - 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 + if [ ! pid = '' ]; then + su -c "pkill -9 -f monitor_check.py" + su -c "pkill -9 -f telecaster_mp3_monitor.yaml" + su -c "pkill -9 -f telecaster_webm_monitor.yaml" + 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 - ;; + ;; + 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 - ;; + *) + 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/conf/etc/init.d/telecaster-audio b/conf/etc/init.d/telecaster-audio deleted file mode 100755 index 2e1b954..0000000 --- a/conf/etc/init.d/telecaster-audio +++ /dev/null @@ -1,63 +0,0 @@ -#!/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/conf/etc/init.d/telecaster-video b/conf/etc/init.d/telecaster-video deleted file mode 100755 index 70203b2..0000000 --- a/conf/etc/init.d/telecaster-video +++ /dev/null @@ -1,63 +0,0 @@ -#!/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"` - 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/conf/etc/init.d/telecaster-vnc b/conf/etc/init.d/telecaster-vnc deleted file mode 100755 index e5d635f..0000000 --- a/conf/etc/init.d/telecaster-vnc +++ /dev/null @@ -1,89 +0,0 @@ -#!/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 -f \"python /usr/local/share/telecaster/scripts/monitor_check.py\" " - 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/conf/home/fluxbox/autostart.sh b/conf/home/telecaster/.fluxbox/autostart.sh similarity index 100% rename from conf/home/fluxbox/autostart.sh rename to conf/home/telecaster/.fluxbox/autostart.sh diff --git a/conf/home/fluxbox/init b/conf/home/telecaster/.fluxbox/init similarity index 100% rename from conf/home/fluxbox/init rename to conf/home/telecaster/.fluxbox/init diff --git a/conf/home/fluxbox/init.ubuntu b/conf/home/telecaster/.fluxbox/init.ubuntu similarity index 100% rename from conf/home/fluxbox/init.ubuntu rename to conf/home/telecaster/.fluxbox/init.ubuntu diff --git a/conf/usr/local/share/telecaster/scripts/monitor_check.py b/conf/home/telecaster/.fluxbox/scripts/monitor_check.py similarity index 100% rename from conf/usr/local/share/telecaster/scripts/monitor_check.py rename to conf/home/telecaster/.fluxbox/scripts/monitor_check.py diff --git a/conf/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh b/conf/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast.sh similarity index 100% rename from conf/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh rename to conf/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast.sh diff --git a/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh b/conf/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh similarity index 100% rename from conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh rename to conf/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh diff --git a/conf/usr/local/bin/telecaster-restart-full b/conf/home/telecaster/.fluxbox/scripts/telecaster-restart-full similarity index 100% rename from conf/usr/local/bin/telecaster-restart-full rename to conf/home/telecaster/.fluxbox/scripts/telecaster-restart-full diff --git a/conf/home/fluxbox/startup.ubuntu b/conf/home/telecaster/.fluxbox/startup.ubuntu similarity index 100% rename from conf/home/fluxbox/startup.ubuntu rename to conf/home/telecaster/.fluxbox/startup.ubuntu diff --git a/conf/home/vnc/xstartup b/conf/home/telecaster/.vnc/xstartup similarity index 100% rename from conf/home/vnc/xstartup rename to conf/home/telecaster/.vnc/xstartup diff --git a/conf/usr/local/share/telecaster/media/mp3/silence.mp3 b/conf/home/telecaster/media/mp3/silence.mp3 similarity index 100% rename from conf/usr/local/share/telecaster/media/mp3/silence.mp3 rename to conf/home/telecaster/media/mp3/silence.mp3 diff --git a/conf/usr/local/share/telecaster/media/ogg/silence.ogg b/conf/home/telecaster/media/ogg/silence.ogg similarity index 100% rename from conf/usr/local/share/telecaster/media/ogg/silence.ogg rename to conf/home/telecaster/media/ogg/silence.ogg diff --git a/conf/usr/local/bin/telecaster-restart b/conf/usr/local/bin/telecaster-restart deleted file mode 100755 index 00ac9bb..0000000 --- a/conf/usr/local/bin/telecaster-restart +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -sudo /etc/init.d/telecaster-audio stop -sudo /etc/init.d/telecaster-video stop -sudo /etc/init.d/telecaster-vnc stop -sudo /etc/init.d/stream-m stop - -sleep 3 - -sudo /etc/init.d/stream-m start -sudo /etc/init.d/telecaster-vnc start - -sleep 10 - -sudo /etc/init.d/telecaster-audio start -sudo /etc/init.d/telecaster-video start diff --git a/doc/compile_gst.txt b/doc/compile_gst.txt new file mode 100644 index 0000000..f7c2206 --- /dev/null +++ b/doc/compile_gst.txt @@ -0,0 +1,19 @@ +Compile Gstreamer from Debian packages for backport +===================================================== + +libvpx-1.3.0$ ./configure --enable-shared + + + +sudo apt-get build-dep -t wheezy-backports gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav + + +apt-get source gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav gir1.2-gstreamer-1.0 gstreamer1.0-tools + +sudo apt-get purge gstreamer1.0-doc gstreamer1.0-libav gstreamer1.0-plugins-bad gstreamer1.0-plugins-base gstreamer1.0-plugins-base-doc gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-tools gstreamer1.0-x libgstreamer1.0-0 libgstreamer1.0-dev gstreamer1.0-libav + +./configure +make -j4 +sudo make install +sudo ldconfig + diff --git a/install.py b/install.py index b31eaaf..ae59474 100644 --- a/install.py +++ b/install.py @@ -51,6 +51,8 @@ def cleanup(path): shutil.rmtree(root + os.sep + dir) class Install(object): + """Live audio and video recording and streaming system based on Gstreamer, + JACK, Vncserver and Fluxbox""" def __init__(self, options): self.options = options @@ -78,6 +80,15 @@ class Install(object): os.system('chown -R ' + self.user + ':' + self.user + ' ' + dir) def install_deps(self): + os.system("""sudo aptitude install python python-dev python-xml python-libxml2 python-pip \ + python-setuptools python-twitter python-liblo python-mutagen \ + icecast2 apache2 apache2-suexec jackd libjack-dev vorbis-tools procps meterbridge fluxbox \ + vnc4server vncviewer swh-plugins jack-rack libshout3 libshout3-dev libmad0-dev libogg-dev \ + g++ python-yaml swatch""") + + # Install DeeFuzzer + os.system("pip install deefuzzer") + # Install Stream-m os.chdir(self.app_dir) os.system('cp -ra lib/stream-m /usr/local/lib/') @@ -94,7 +105,7 @@ class Install(object): self.chown(conf_dir) for dir in os.listdir('conf/home'): - home_dir = self.home + '/.' + dir + home_dir = self.home + dir if not os.path.exists(home_dir): os.makedirs(home_dir) os.system('cp -r conf/home/'+dir + '/* ' + home_dir) @@ -124,7 +135,7 @@ class Install(object): os.system('cp -ra conf/usr/* /usr/') os.system('cp -ra conf/etc/init.d/* /etc/init.d/') - + os.system('sudo update-rc.d -f jackd remove') os.system('sudo update-rc.d -f stream-m remove') os.system('sudo update-rc.d -f vncserver remove') @@ -133,8 +144,6 @@ class Install(object): os.system('update-rc.d jackd defaults 30 30') os.system('update-rc.d stream-m defaults 20 20') os.system('update-rc.d telecaster-vnc defaults 80 15') - os.system('update-rc.d telecaster-video defaults 81 14') - os.system('update-rc.d telecaster-audio defaults 82 13') os.system('chmod 777 ' + self.m3u_dir) os.system('chmod 666 ' + self.m3u_dir + '/*') @@ -143,7 +152,7 @@ class Install(object): os.system('chmod 775 ' + self.log_dir) os.system('sudo adduser www-data telecaster') - + def run(self): if self.options['keepinit'] == False: print 'Installing init files...' @@ -176,12 +185,7 @@ def run(): Installation successfull ! Now, please : - - configure your telecaster editing: - /etc/telecaster/telecaster.xml - /etc/telecaster/deefuzzer.xml - - configure your apache VirtualHost editing /etc/apache2/sites-available/telecaster.conf - - tune your audio and video servers and REBOOT! See README for more infos. diff --git a/media/silence_mono.mp3 b/media/silence_mono.mp3 deleted file mode 100644 index b9514968a43484ea26556a12ffed384e755c50df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122880 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 xe;@`