From 7dd36f60aa46e8a07e23156a3b5b6753558ab7fa Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 8 Dec 2014 13:54:26 +0100 Subject: [PATCH] move! --- tcserver/__init__.py => __init__.py | 0 .../apache2/sites-available/telecaster.conf | 0 .../etc/cron.d/telecaster_cleanup | 0 .../etc/cron.d/telecaster_import | 0 .../etc/cron.d/telecaster_restart | 0 .../conf => conf}/etc/cron.d/telecaster_rsync | 0 {tcserver/conf => conf}/etc/default/jackd | 0 {tcserver/conf => conf}/etc/default/stream-m | 0 .../conf => conf}/etc/default/telecaster | 0 .../conf => conf}/etc/icecast2/icecast.xml | 0 {tcserver/conf => conf}/etc/init.d/jackd | 0 {tcserver/conf => conf}/etc/init.d/stream-m | 0 {tcserver/conf => conf}/etc/init.d/telecaster | 0 .../conf => conf}/etc/init.d/telecaster-audio | 0 .../conf => conf}/etc/init.d/telecaster-video | 0 .../conf => conf}/etc/init.d/telecaster-vnc | 0 {tcserver/conf => conf}/etc/init.d/uwsgi | 0 .../etc/network/if-up.d/reverse_ssh_tunnel | 0 .../etc/network/if-up.d/telecaster-rsync | 0 .../etc/nginx/sites-available/telecaster.conf | 0 .../conf => conf}/etc/nginx/uwsgi_params | 0 .../etc/pm/sleep.d/telecaster_suspend | 0 .../conf => conf}/etc/stream-m/server.conf | 0 .../deefuzzer/telecaster_mp3_default.xml | 0 .../deefuzzer/telecaster_mp3_monitor.yaml | 0 .../deefuzzer/telecaster_webm_default.xml | 0 .../deefuzzer/telecaster_webm_monitor.yaml | 0 .../jack-rack/eq_comp_limit_02.rack | Bin .../jack-rack/eq_comp_limit_02_old.rack | Bin .../etc/telecaster/old/edcast_jack_local.cfg | 0 .../telecaster/old/edcast_jack_local_mp3.cfg | 0 .../telecaster/old/edcast_jack_local_ogg.cfg | 0 .../etc/telecaster/old/telecaster.xml | 0 .../etc/telecaster/old/telecaster_mp3.xml | 0 .../etc/telecaster/old/telecaster_ogg.xml | 0 .../old/telecaster_parisson_mp3.xml | 0 .../etc/telecaster/old/telecaster_pb.xml | 0 .../etc/telecaster/tests/deefuzzer.xml | 0 .../telecaster/tests/deefuzzer_audio_safe.xml | 0 .../etc/telecaster/tests/deefuzzer_ogg.xml | 0 .../etc/telecaster/tests/deefuzzer_safe.xml | 0 .../telecaster/tests/deefuzzer_safe_mp3.xml | 0 .../telecaster/tests/deefuzzer_safe_ogg.xml | 0 .../etc/telecaster/tests/deefuzzer_video.xml | 0 .../tests/deefuzzer_video_local.xml | 0 .../telecaster/tests/deefuzzer_video_safe.xml | 0 .../tests/telecaster_audio_monitor.xml | 0 .../tests/telecaster_audio_monitor2.yaml | 0 conf/home/fluxbox/autostart.sh | 156 ++++++++++++++++++ {tcserver/conf => conf}/home/fluxbox/init | 0 .../conf => conf}/home/fluxbox/init.ubuntu | 0 .../conf => conf}/home/fluxbox/startup.ubuntu | 0 {tcserver/conf => conf}/home/vnc/xstartup | 0 .../usr/local/bin/telecaster-restart | 0 .../usr/local/bin/telecaster-restart-full | 0 .../share/telecaster/media/mp3/silence.mp3 | Bin .../share/telecaster/media/ogg/silence.ogg | Bin .../share/telecaster/scripts/monitor_check.py | 0 .../scripts/tc_audio_mp3_icecast.sh | 0 .../scripts/tc_video_simple_webm_stream.sh | 0 tcserver/install.py => install.py | 0 {tcserver/lib => lib}/stream-m/GPL.txt | 0 {tcserver/lib => lib}/stream-m/README.txt | 0 {tcserver/lib => lib}/stream-m/bin/stream-m | 0 {tcserver/lib => lib}/stream-m/console.zip | Bin .../lib => lib}/stream-m/lib/stream-m.jar | Bin {tcserver/lib => lib}/stream-m/run.sh | 0 .../lib => lib}/stream-m/server.conf.sample | 0 {tcserver/media => media}/silence_mono.mp3 | Bin {tcserver/media => media}/silence_mono.ogg | Bin tcserver/conf/home/fluxbox/autostart.sh | 68 -------- 71 files changed, 156 insertions(+), 68 deletions(-) rename tcserver/__init__.py => __init__.py (100%) rename {tcserver/conf => conf}/etc/apache2/sites-available/telecaster.conf (100%) rename {tcserver/conf => conf}/etc/cron.d/telecaster_cleanup (100%) rename {tcserver/conf => conf}/etc/cron.d/telecaster_import (100%) rename {tcserver/conf => conf}/etc/cron.d/telecaster_restart (100%) rename {tcserver/conf => conf}/etc/cron.d/telecaster_rsync (100%) rename {tcserver/conf => conf}/etc/default/jackd (100%) rename {tcserver/conf => conf}/etc/default/stream-m (100%) rename {tcserver/conf => conf}/etc/default/telecaster (100%) rename {tcserver/conf => conf}/etc/icecast2/icecast.xml (100%) rename {tcserver/conf => conf}/etc/init.d/jackd (100%) rename {tcserver/conf => conf}/etc/init.d/stream-m (100%) rename {tcserver/conf => conf}/etc/init.d/telecaster (100%) rename {tcserver/conf => conf}/etc/init.d/telecaster-audio (100%) rename {tcserver/conf => conf}/etc/init.d/telecaster-video (100%) rename {tcserver/conf => conf}/etc/init.d/telecaster-vnc (100%) rename {tcserver/conf => conf}/etc/init.d/uwsgi (100%) rename {tcserver/conf => conf}/etc/network/if-up.d/reverse_ssh_tunnel (100%) rename {tcserver/conf => conf}/etc/network/if-up.d/telecaster-rsync (100%) rename {tcserver/conf => conf}/etc/nginx/sites-available/telecaster.conf (100%) rename {tcserver/conf => conf}/etc/nginx/uwsgi_params (100%) rename {tcserver/conf => conf}/etc/pm/sleep.d/telecaster_suspend (100%) rename {tcserver/conf => conf}/etc/stream-m/server.conf (100%) rename {tcserver/conf => conf}/etc/telecaster/deefuzzer/telecaster_mp3_default.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml (100%) rename {tcserver/conf => conf}/etc/telecaster/deefuzzer/telecaster_webm_default.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml (100%) rename {tcserver/conf => conf}/etc/telecaster/jack-rack/eq_comp_limit_02.rack (100%) rename {tcserver/conf => conf}/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack (100%) rename {tcserver/conf => conf}/etc/telecaster/old/edcast_jack_local.cfg (100%) rename {tcserver/conf => conf}/etc/telecaster/old/edcast_jack_local_mp3.cfg (100%) rename {tcserver/conf => conf}/etc/telecaster/old/edcast_jack_local_ogg.cfg (100%) rename {tcserver/conf => conf}/etc/telecaster/old/telecaster.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/old/telecaster_mp3.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/old/telecaster_ogg.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/old/telecaster_parisson_mp3.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/old/telecaster_pb.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/deefuzzer.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/deefuzzer_audio_safe.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/deefuzzer_ogg.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/deefuzzer_safe.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/deefuzzer_safe_mp3.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/deefuzzer_safe_ogg.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/deefuzzer_video.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/deefuzzer_video_local.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/deefuzzer_video_safe.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/telecaster_audio_monitor.xml (100%) rename {tcserver/conf => conf}/etc/telecaster/tests/telecaster_audio_monitor2.yaml (100%) create mode 100755 conf/home/fluxbox/autostart.sh rename {tcserver/conf => conf}/home/fluxbox/init (100%) rename {tcserver/conf => conf}/home/fluxbox/init.ubuntu (100%) rename {tcserver/conf => conf}/home/fluxbox/startup.ubuntu (100%) rename {tcserver/conf => conf}/home/vnc/xstartup (100%) rename {tcserver/conf => conf}/usr/local/bin/telecaster-restart (100%) rename {tcserver/conf => conf}/usr/local/bin/telecaster-restart-full (100%) rename {tcserver/conf => conf}/usr/local/share/telecaster/media/mp3/silence.mp3 (100%) rename {tcserver/conf => conf}/usr/local/share/telecaster/media/ogg/silence.ogg (100%) rename {tcserver/conf => conf}/usr/local/share/telecaster/scripts/monitor_check.py (100%) rename {tcserver/conf => conf}/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh (100%) rename {tcserver/conf => conf}/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh (100%) rename tcserver/install.py => install.py (100%) rename {tcserver/lib => lib}/stream-m/GPL.txt (100%) rename {tcserver/lib => lib}/stream-m/README.txt (100%) rename {tcserver/lib => lib}/stream-m/bin/stream-m (100%) rename {tcserver/lib => lib}/stream-m/console.zip (100%) rename {tcserver/lib => lib}/stream-m/lib/stream-m.jar (100%) rename {tcserver/lib => lib}/stream-m/run.sh (100%) rename {tcserver/lib => lib}/stream-m/server.conf.sample (100%) rename {tcserver/media => media}/silence_mono.mp3 (100%) rename {tcserver/media => media}/silence_mono.ogg (100%) delete mode 100755 tcserver/conf/home/fluxbox/autostart.sh diff --git a/tcserver/__init__.py b/__init__.py similarity index 100% rename from tcserver/__init__.py rename to __init__.py diff --git a/tcserver/conf/etc/apache2/sites-available/telecaster.conf b/conf/etc/apache2/sites-available/telecaster.conf similarity index 100% rename from tcserver/conf/etc/apache2/sites-available/telecaster.conf rename to conf/etc/apache2/sites-available/telecaster.conf diff --git a/tcserver/conf/etc/cron.d/telecaster_cleanup b/conf/etc/cron.d/telecaster_cleanup similarity index 100% rename from tcserver/conf/etc/cron.d/telecaster_cleanup rename to conf/etc/cron.d/telecaster_cleanup diff --git a/tcserver/conf/etc/cron.d/telecaster_import b/conf/etc/cron.d/telecaster_import similarity index 100% rename from tcserver/conf/etc/cron.d/telecaster_import rename to conf/etc/cron.d/telecaster_import diff --git a/tcserver/conf/etc/cron.d/telecaster_restart b/conf/etc/cron.d/telecaster_restart similarity index 100% rename from tcserver/conf/etc/cron.d/telecaster_restart rename to conf/etc/cron.d/telecaster_restart diff --git a/tcserver/conf/etc/cron.d/telecaster_rsync b/conf/etc/cron.d/telecaster_rsync similarity index 100% rename from tcserver/conf/etc/cron.d/telecaster_rsync rename to conf/etc/cron.d/telecaster_rsync diff --git a/tcserver/conf/etc/default/jackd b/conf/etc/default/jackd similarity index 100% rename from tcserver/conf/etc/default/jackd rename to conf/etc/default/jackd diff --git a/tcserver/conf/etc/default/stream-m b/conf/etc/default/stream-m similarity index 100% rename from tcserver/conf/etc/default/stream-m rename to conf/etc/default/stream-m diff --git a/tcserver/conf/etc/default/telecaster b/conf/etc/default/telecaster similarity index 100% rename from tcserver/conf/etc/default/telecaster rename to conf/etc/default/telecaster diff --git a/tcserver/conf/etc/icecast2/icecast.xml b/conf/etc/icecast2/icecast.xml similarity index 100% rename from tcserver/conf/etc/icecast2/icecast.xml rename to conf/etc/icecast2/icecast.xml diff --git a/tcserver/conf/etc/init.d/jackd b/conf/etc/init.d/jackd similarity index 100% rename from tcserver/conf/etc/init.d/jackd rename to conf/etc/init.d/jackd diff --git a/tcserver/conf/etc/init.d/stream-m b/conf/etc/init.d/stream-m similarity index 100% rename from tcserver/conf/etc/init.d/stream-m rename to conf/etc/init.d/stream-m diff --git a/tcserver/conf/etc/init.d/telecaster b/conf/etc/init.d/telecaster similarity index 100% rename from tcserver/conf/etc/init.d/telecaster rename to conf/etc/init.d/telecaster diff --git a/tcserver/conf/etc/init.d/telecaster-audio b/conf/etc/init.d/telecaster-audio similarity index 100% rename from tcserver/conf/etc/init.d/telecaster-audio rename to conf/etc/init.d/telecaster-audio diff --git a/tcserver/conf/etc/init.d/telecaster-video b/conf/etc/init.d/telecaster-video similarity index 100% rename from tcserver/conf/etc/init.d/telecaster-video rename to conf/etc/init.d/telecaster-video diff --git a/tcserver/conf/etc/init.d/telecaster-vnc b/conf/etc/init.d/telecaster-vnc similarity index 100% rename from tcserver/conf/etc/init.d/telecaster-vnc rename to conf/etc/init.d/telecaster-vnc diff --git a/tcserver/conf/etc/init.d/uwsgi b/conf/etc/init.d/uwsgi similarity index 100% rename from tcserver/conf/etc/init.d/uwsgi rename to conf/etc/init.d/uwsgi diff --git a/tcserver/conf/etc/network/if-up.d/reverse_ssh_tunnel b/conf/etc/network/if-up.d/reverse_ssh_tunnel similarity index 100% rename from tcserver/conf/etc/network/if-up.d/reverse_ssh_tunnel rename to conf/etc/network/if-up.d/reverse_ssh_tunnel diff --git a/tcserver/conf/etc/network/if-up.d/telecaster-rsync b/conf/etc/network/if-up.d/telecaster-rsync similarity index 100% rename from tcserver/conf/etc/network/if-up.d/telecaster-rsync rename to conf/etc/network/if-up.d/telecaster-rsync diff --git a/tcserver/conf/etc/nginx/sites-available/telecaster.conf b/conf/etc/nginx/sites-available/telecaster.conf similarity index 100% rename from tcserver/conf/etc/nginx/sites-available/telecaster.conf rename to conf/etc/nginx/sites-available/telecaster.conf diff --git a/tcserver/conf/etc/nginx/uwsgi_params b/conf/etc/nginx/uwsgi_params similarity index 100% rename from tcserver/conf/etc/nginx/uwsgi_params rename to conf/etc/nginx/uwsgi_params diff --git a/tcserver/conf/etc/pm/sleep.d/telecaster_suspend b/conf/etc/pm/sleep.d/telecaster_suspend similarity index 100% rename from tcserver/conf/etc/pm/sleep.d/telecaster_suspend rename to conf/etc/pm/sleep.d/telecaster_suspend diff --git a/tcserver/conf/etc/stream-m/server.conf b/conf/etc/stream-m/server.conf similarity index 100% rename from tcserver/conf/etc/stream-m/server.conf rename to conf/etc/stream-m/server.conf diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml b/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml rename to conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml b/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml rename to conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml b/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml rename to conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml b/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml rename to conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml diff --git a/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack b/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack similarity index 100% rename from tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack rename to conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack diff --git a/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack b/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack similarity index 100% rename from tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack rename to conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack diff --git a/tcserver/conf/etc/telecaster/old/edcast_jack_local.cfg b/conf/etc/telecaster/old/edcast_jack_local.cfg similarity index 100% rename from tcserver/conf/etc/telecaster/old/edcast_jack_local.cfg rename to conf/etc/telecaster/old/edcast_jack_local.cfg diff --git a/tcserver/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg b/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg similarity index 100% rename from tcserver/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg rename to conf/etc/telecaster/old/edcast_jack_local_mp3.cfg diff --git a/tcserver/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg b/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg similarity index 100% rename from tcserver/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg rename to conf/etc/telecaster/old/edcast_jack_local_ogg.cfg diff --git a/tcserver/conf/etc/telecaster/old/telecaster.xml b/conf/etc/telecaster/old/telecaster.xml similarity index 100% rename from tcserver/conf/etc/telecaster/old/telecaster.xml rename to conf/etc/telecaster/old/telecaster.xml diff --git a/tcserver/conf/etc/telecaster/old/telecaster_mp3.xml b/conf/etc/telecaster/old/telecaster_mp3.xml similarity index 100% rename from tcserver/conf/etc/telecaster/old/telecaster_mp3.xml rename to conf/etc/telecaster/old/telecaster_mp3.xml diff --git a/tcserver/conf/etc/telecaster/old/telecaster_ogg.xml b/conf/etc/telecaster/old/telecaster_ogg.xml similarity index 100% rename from tcserver/conf/etc/telecaster/old/telecaster_ogg.xml rename to conf/etc/telecaster/old/telecaster_ogg.xml diff --git a/tcserver/conf/etc/telecaster/old/telecaster_parisson_mp3.xml b/conf/etc/telecaster/old/telecaster_parisson_mp3.xml similarity index 100% rename from tcserver/conf/etc/telecaster/old/telecaster_parisson_mp3.xml rename to conf/etc/telecaster/old/telecaster_parisson_mp3.xml diff --git a/tcserver/conf/etc/telecaster/old/telecaster_pb.xml b/conf/etc/telecaster/old/telecaster_pb.xml similarity index 100% rename from tcserver/conf/etc/telecaster/old/telecaster_pb.xml rename to conf/etc/telecaster/old/telecaster_pb.xml diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer.xml b/conf/etc/telecaster/tests/deefuzzer.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/deefuzzer.xml rename to conf/etc/telecaster/tests/deefuzzer.xml diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml b/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml rename to conf/etc/telecaster/tests/deefuzzer_audio_safe.xml diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_ogg.xml b/conf/etc/telecaster/tests/deefuzzer_ogg.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/deefuzzer_ogg.xml rename to conf/etc/telecaster/tests/deefuzzer_ogg.xml diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_safe.xml b/conf/etc/telecaster/tests/deefuzzer_safe.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/deefuzzer_safe.xml rename to conf/etc/telecaster/tests/deefuzzer_safe.xml diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml b/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml rename to conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml b/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml rename to conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_video.xml b/conf/etc/telecaster/tests/deefuzzer_video.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/deefuzzer_video.xml rename to conf/etc/telecaster/tests/deefuzzer_video.xml diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_video_local.xml b/conf/etc/telecaster/tests/deefuzzer_video_local.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/deefuzzer_video_local.xml rename to conf/etc/telecaster/tests/deefuzzer_video_local.xml diff --git a/tcserver/conf/etc/telecaster/tests/deefuzzer_video_safe.xml b/conf/etc/telecaster/tests/deefuzzer_video_safe.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/deefuzzer_video_safe.xml rename to conf/etc/telecaster/tests/deefuzzer_video_safe.xml diff --git a/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor.xml b/conf/etc/telecaster/tests/telecaster_audio_monitor.xml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor.xml rename to conf/etc/telecaster/tests/telecaster_audio_monitor.xml diff --git a/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml b/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml similarity index 100% rename from tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml rename to conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml diff --git a/conf/home/fluxbox/autostart.sh b/conf/home/fluxbox/autostart.sh new file mode 100755 index 0000000..2e14cff --- /dev/null +++ b/conf/home/fluxbox/autostart.sh @@ -0,0 +1,156 @@ +#!/bin/sh + +# --------------------- +# Audio channel +# --------------------- + +pid=`pgrep jack-rack` + + +if [ ! $pid = "" ]; then + sleep 1 +else + jack-rack -n /etc/telecaster/jack-rack/eq_comp_limit_02.rack > /dev/null & + sleep 3 +fi + +jack_connect system:capture_1 jack_rack:in_1 +jack_connect system:capture_2 jack_rack:in_2 + +qjackctl & + +scripts/tc_audio_mp3_icecast.sh & +#edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n lamemp3enc -p jack_rack > /dev/null & + +sleep 2 + +# MONO +#jack_connect jack_rack:out_1 lamemp3enc:in_jackaudiosrc0_2 +#jack_connect jack_rack:out_1 system:playback_1 +#jack_connect jack_rack:out_1 system:playback_2 + +# STEREO setup +jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1 +jack_disconnect system:capture_2 gst-launch-0.10:in_jackaudiosrc0_2 + +jack_connect jack_rack:out_1 gst-launch-0.10:in_jackaudiosrc0_1 +jack_connect jack_rack:out_2 gst-launch-0.10:in_jackaudiosrc0_2 + +#jack_connect jack_rack:out_1 lamemp3enc:in_1 +#jack_connect jack_rack:out_2 lamemp3enc:in_2 +#jack_connect jack_rack:out_1 system:playback_1 +#jack_connect jack_rack:out_2 system:playback_2 + +# 4 channels setup +#jack_connect system:capture_1 jack_rack:in_1 +#jack_connect system:capture_1 jack_rack:in_2 +#jack_connect system:capture_2 jack_rack:in_1 +#jack_connect system:capture_2 jack_rack:in_2 +#jack_connect system:capture_3 jack_rack:in_1 +#jack_connect system:capture_4 jack_rack:in_2 + +# --------------------- +# Video channel +# --------------------- + +scripts/tc_video_simple_webm_stream.sh & + +sleep 2 + +jack_disconnect system:capture_1 gst-launch-0.10-01:in_jackaudiosrc0_1 +jack_disconnect system:capture_2 gst-launch-0.10-01:in_jackaudiosrc0_2 + +jack_connect jack_rack:out_1 gst-launch-0.10-01:in_jackaudiosrc0_1 +jack_connect jack_rack:out_2 gst-launch-0.10-01:in_jackaudiosrc0_2 + +sleep 1 + +#Audio monitor +deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml & + +#Video monitor +deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml & + +sleep 3 + +#Wathdog for trash +python scripts/monitor_check.py 10 /home/telecaster/trash/webm/ smtp.icp.fr informatique@icp.fr alerts@parisson.com & + +#!/bin/sh + +# --------------------- +# Audio channel +# --------------------- + +pid=`pgrep jack-rack` + + +if [ ! $pid = "" ]; then + sleep 1 +else + jack-rack -n /etc/telecaster/jack-rack/eq_comp_limit_02.rack > /dev/null & + sleep 3 +fi + +jack_connect system:capture_1 jack_rack:in_1 +jack_connect system:capture_2 jack_rack:in_2 + +qjackctl & + +scripts/tc_audio_mp3_icecast.sh & +#edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n lamemp3enc -p jack_rack > /dev/null & + +sleep 2 + +# MONO +#jack_connect jack_rack:out_1 lamemp3enc:in_jackaudiosrc0_2 +#jack_connect jack_rack:out_1 system:playback_1 +#jack_connect jack_rack:out_1 system:playback_2 + +# STEREO setup +jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1 +jack_disconnect system:capture_2 gst-launch-0.10:in_jackaudiosrc0_2 + +jack_connect jack_rack:out_1 gst-launch-0.10:in_jackaudiosrc0_1 +jack_connect jack_rack:out_2 gst-launch-0.10:in_jackaudiosrc0_2 + +#jack_connect jack_rack:out_1 lamemp3enc:in_1 +#jack_connect jack_rack:out_2 lamemp3enc:in_2 +#jack_connect jack_rack:out_1 system:playback_1 +#jack_connect jack_rack:out_2 system:playback_2 + +# 4 channels setup +#jack_connect system:capture_1 jack_rack:in_1 +#jack_connect system:capture_1 jack_rack:in_2 +#jack_connect system:capture_2 jack_rack:in_1 +#jack_connect system:capture_2 jack_rack:in_2 +#jack_connect system:capture_3 jack_rack:in_1 +#jack_connect system:capture_4 jack_rack:in_2 + +# --------------------- +# Video channel +# --------------------- + +scripts/tc_video_simple_webm_stream.sh & + +sleep 2 + +jack_disconnect system:capture_1 gst-launch-0.10-01:in_jackaudiosrc0_1 +jack_disconnect system:capture_2 gst-launch-0.10-01:in_jackaudiosrc0_2 + +jack_connect jack_rack:out_1 gst-launch-0.10-01:in_jackaudiosrc0_1 +jack_connect jack_rack:out_2 gst-launch-0.10-01:in_jackaudiosrc0_2 + +sleep 1 + +#Audio monitor +deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml & + +#Video monitor +deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml & + +sleep 3 + +#Wathdog for trash +python scripts/monitor_check.py 10 /home/telecaster/trash/webm/ smtp.icp.fr informatique@icp.fr alerts@parisson.com & + diff --git a/tcserver/conf/home/fluxbox/init b/conf/home/fluxbox/init similarity index 100% rename from tcserver/conf/home/fluxbox/init rename to conf/home/fluxbox/init diff --git a/tcserver/conf/home/fluxbox/init.ubuntu b/conf/home/fluxbox/init.ubuntu similarity index 100% rename from tcserver/conf/home/fluxbox/init.ubuntu rename to conf/home/fluxbox/init.ubuntu diff --git a/tcserver/conf/home/fluxbox/startup.ubuntu b/conf/home/fluxbox/startup.ubuntu similarity index 100% rename from tcserver/conf/home/fluxbox/startup.ubuntu rename to conf/home/fluxbox/startup.ubuntu diff --git a/tcserver/conf/home/vnc/xstartup b/conf/home/vnc/xstartup similarity index 100% rename from tcserver/conf/home/vnc/xstartup rename to conf/home/vnc/xstartup diff --git a/tcserver/conf/usr/local/bin/telecaster-restart b/conf/usr/local/bin/telecaster-restart similarity index 100% rename from tcserver/conf/usr/local/bin/telecaster-restart rename to conf/usr/local/bin/telecaster-restart diff --git a/tcserver/conf/usr/local/bin/telecaster-restart-full b/conf/usr/local/bin/telecaster-restart-full similarity index 100% rename from tcserver/conf/usr/local/bin/telecaster-restart-full rename to conf/usr/local/bin/telecaster-restart-full diff --git a/tcserver/conf/usr/local/share/telecaster/media/mp3/silence.mp3 b/conf/usr/local/share/telecaster/media/mp3/silence.mp3 similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/media/mp3/silence.mp3 rename to conf/usr/local/share/telecaster/media/mp3/silence.mp3 diff --git a/tcserver/conf/usr/local/share/telecaster/media/ogg/silence.ogg b/conf/usr/local/share/telecaster/media/ogg/silence.ogg similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/media/ogg/silence.ogg rename to conf/usr/local/share/telecaster/media/ogg/silence.ogg diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/monitor_check.py b/conf/usr/local/share/telecaster/scripts/monitor_check.py similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/monitor_check.py rename to conf/usr/local/share/telecaster/scripts/monitor_check.py diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh b/conf/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh rename to conf/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh b/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh rename to conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh diff --git a/tcserver/install.py b/install.py similarity index 100% rename from tcserver/install.py rename to install.py diff --git a/tcserver/lib/stream-m/GPL.txt b/lib/stream-m/GPL.txt similarity index 100% rename from tcserver/lib/stream-m/GPL.txt rename to lib/stream-m/GPL.txt diff --git a/tcserver/lib/stream-m/README.txt b/lib/stream-m/README.txt similarity index 100% rename from tcserver/lib/stream-m/README.txt rename to lib/stream-m/README.txt diff --git a/tcserver/lib/stream-m/bin/stream-m b/lib/stream-m/bin/stream-m similarity index 100% rename from tcserver/lib/stream-m/bin/stream-m rename to lib/stream-m/bin/stream-m diff --git a/tcserver/lib/stream-m/console.zip b/lib/stream-m/console.zip similarity index 100% rename from tcserver/lib/stream-m/console.zip rename to lib/stream-m/console.zip diff --git a/tcserver/lib/stream-m/lib/stream-m.jar b/lib/stream-m/lib/stream-m.jar similarity index 100% rename from tcserver/lib/stream-m/lib/stream-m.jar rename to lib/stream-m/lib/stream-m.jar diff --git a/tcserver/lib/stream-m/run.sh b/lib/stream-m/run.sh similarity index 100% rename from tcserver/lib/stream-m/run.sh rename to lib/stream-m/run.sh diff --git a/tcserver/lib/stream-m/server.conf.sample b/lib/stream-m/server.conf.sample similarity index 100% rename from tcserver/lib/stream-m/server.conf.sample rename to lib/stream-m/server.conf.sample diff --git a/tcserver/media/silence_mono.mp3 b/media/silence_mono.mp3 similarity index 100% rename from tcserver/media/silence_mono.mp3 rename to media/silence_mono.mp3 diff --git a/tcserver/media/silence_mono.ogg b/media/silence_mono.ogg similarity index 100% rename from tcserver/media/silence_mono.ogg rename to media/silence_mono.ogg diff --git a/tcserver/conf/home/fluxbox/autostart.sh b/tcserver/conf/home/fluxbox/autostart.sh deleted file mode 100755 index a1d4168..0000000 --- a/tcserver/conf/home/fluxbox/autostart.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh - -# --------------------- -# Audio channel -# --------------------- - -pid=`pgrep jack-rack` - - -if [ ! $pid = "" ]; then - sleep 1 -else - jack-rack -n /etc/telecaster/jack-rack/eq_comp_limit_02.rack > /dev/null & - sleep 3 -fi - -jack_connect system:capture_1 jack_rack:in_1 -jack_connect system:capture_2 jack_rack:in_2 - -qjackctl & - -/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh & -#edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n lamemp3enc -p jack_rack > /dev/null & - -sleep 2 - - -# MONO -#jack_connect jack_rack:out_1 lamemp3enc:in_jackaudiosrc0_2 -#jack_connect jack_rack:out_1 system:playback_1 -#jack_connect jack_rack:out_1 system:playback_2 - -# STEREO setup -jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1 -jack_disconnect system:capture_2 gst-launch-0.10:in_jackaudiosrc0_2 - -jack_connect jack_rack:out_1 gst-launch-0.10:in_jackaudiosrc0_1 -jack_connect jack_rack:out_2 gst-launch-0.10:in_jackaudiosrc0_2 - -#jack_connect jack_rack:out_1 lamemp3enc:in_1 -#jack_connect jack_rack:out_2 lamemp3enc:in_2 -#jack_connect jack_rack:out_1 system:playback_1 -#jack_connect jack_rack:out_2 system:playback_2 - -# 4 channels setup -#jack_connect system:capture_1 jack_rack:in_1 -#jack_connect system:capture_1 jack_rack:in_2 -#jack_connect system:capture_2 jack_rack:in_1 -#jack_connect system:capture_2 jack_rack:in_2 -#jack_connect system:capture_3 jack_rack:in_1 -#jack_connect system:capture_4 jack_rack:in_2 - -# --------------------- -# Video channel -# --------------------- - -/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh & - -sleep 2 - -jack_disconnect system:capture_1 gst-launch-0.10-01:in_jackaudiosrc0_1 -jack_disconnect system:capture_2 gst-launch-0.10-01:in_jackaudiosrc0_2 - -jack_connect jack_rack:out_1 gst-launch-0.10-01:in_jackaudiosrc0_1 -jack_connect jack_rack:out_2 gst-launch-0.10-01:in_jackaudiosrc0_2 - -python /usr/local/share/telecaster/scripts/monitor_check.py 10 /home/telecaster/trash/webm/ angus.parisson.com telecaster@parisson.com alerts@parisson.com & - -- 2.39.5