From 4c509db33928f1588a15ac085a361e4c1c0d643e Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sun, 31 Jan 2016 21:26:07 +0100 Subject: [PATCH] mv conf to src --- install.py | 18 +++++++++--------- .../apache2/sites-available/telecaster.conf | 0 {conf => src}/etc/cron.d/telecaster | 0 {conf => src}/etc/default/jackd | 0 {conf => src}/etc/default/stream-m | 0 {conf => src}/etc/default/telecaster | 0 {conf => src}/etc/icecast2/icecast.xml | 0 {conf => src}/etc/init.d/jackd | 0 {conf => src}/etc/init.d/stream-m | 0 {conf => src}/etc/init.d/telecaster | 0 {conf => src}/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 => src}/etc/nginx/uwsgi_params | 0 .../etc/pm/sleep.d/telecaster_suspend | 0 {conf => src}/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 .../home/telecaster/.fluxbox/autostart.sh | 0 {conf => src}/home/telecaster/.fluxbox/init | 0 .../home/telecaster/.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 .../home/telecaster/.fluxbox/startup.ubuntu | 0 {conf => src}/home/telecaster/.vnc/xstartup | 0 .../home/telecaster/media/mp3/silence.mp3 | Bin .../home/telecaster/media/ogg/silence.ogg | Bin .../usr/local/bin/telecaster-restart-full | 0 54 files changed, 9 insertions(+), 9 deletions(-) rename {conf => src}/etc/apache2/sites-available/telecaster.conf (100%) rename {conf => src}/etc/cron.d/telecaster (100%) rename {conf => src}/etc/default/jackd (100%) rename {conf => src}/etc/default/stream-m (100%) rename {conf => src}/etc/default/telecaster (100%) rename {conf => src}/etc/icecast2/icecast.xml (100%) rename {conf => src}/etc/init.d/jackd (100%) rename {conf => src}/etc/init.d/stream-m (100%) rename {conf => src}/etc/init.d/telecaster (100%) rename {conf => src}/etc/init.d/uwsgi (100%) rename {conf => src}/etc/network/if-up.d/reverse_ssh_tunnel (100%) rename {conf => src}/etc/network/if-up.d/telecaster-rsync (100%) rename {conf => src}/etc/nginx/sites-available/telecaster.conf (100%) rename {conf => src}/etc/nginx/uwsgi_params (100%) rename {conf => src}/etc/pm/sleep.d/telecaster_suspend (100%) rename {conf => src}/etc/stream-m/server.conf (100%) rename {conf => src}/etc/telecaster/deefuzzer/telecaster_mp3_default.xml (100%) rename {conf => src}/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml (100%) rename {conf => src}/etc/telecaster/deefuzzer/telecaster_webm_default.xml (100%) rename {conf => src}/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml (100%) rename {conf => src}/etc/telecaster/jack-rack/eq_comp_limit_02.rack (100%) rename {conf => src}/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack (100%) rename {conf => src}/etc/telecaster/old/edcast_jack_local.cfg (100%) rename {conf => src}/etc/telecaster/old/edcast_jack_local_mp3.cfg (100%) rename {conf => src}/etc/telecaster/old/edcast_jack_local_ogg.cfg (100%) rename {conf => src}/etc/telecaster/old/telecaster.xml (100%) rename {conf => src}/etc/telecaster/old/telecaster_mp3.xml (100%) rename {conf => src}/etc/telecaster/old/telecaster_ogg.xml (100%) rename {conf => src}/etc/telecaster/old/telecaster_parisson_mp3.xml (100%) rename {conf => src}/etc/telecaster/old/telecaster_pb.xml (100%) rename {conf => src}/etc/telecaster/tests/deefuzzer.xml (100%) rename {conf => src}/etc/telecaster/tests/deefuzzer_audio_safe.xml (100%) rename {conf => src}/etc/telecaster/tests/deefuzzer_ogg.xml (100%) rename {conf => src}/etc/telecaster/tests/deefuzzer_safe.xml (100%) rename {conf => src}/etc/telecaster/tests/deefuzzer_safe_mp3.xml (100%) rename {conf => src}/etc/telecaster/tests/deefuzzer_safe_ogg.xml (100%) rename {conf => src}/etc/telecaster/tests/deefuzzer_video.xml (100%) rename {conf => src}/etc/telecaster/tests/deefuzzer_video_local.xml (100%) rename {conf => src}/etc/telecaster/tests/deefuzzer_video_safe.xml (100%) rename {conf => src}/etc/telecaster/tests/telecaster_audio_monitor.xml (100%) rename {conf => src}/etc/telecaster/tests/telecaster_audio_monitor2.yaml (100%) rename {conf => src}/home/telecaster/.fluxbox/autostart.sh (100%) rename {conf => src}/home/telecaster/.fluxbox/init (100%) rename {conf => src}/home/telecaster/.fluxbox/init.ubuntu (100%) rename {conf => src}/home/telecaster/.fluxbox/scripts/monitor_check.py (100%) rename {conf => src}/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast.sh (100%) rename {conf => src}/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh (100%) rename {conf => src}/home/telecaster/.fluxbox/scripts/telecaster-restart-full (100%) rename {conf => src}/home/telecaster/.fluxbox/startup.ubuntu (100%) rename {conf => src}/home/telecaster/.vnc/xstartup (100%) rename {conf => src}/home/telecaster/media/mp3/silence.mp3 (100%) rename {conf => src}/home/telecaster/media/ogg/silence.ogg (100%) rename {conf => src}/usr/local/bin/telecaster-restart-full (100%) diff --git a/install.py b/install.py index f036c42..f877245 100644 --- a/install.py +++ b/install.py @@ -100,23 +100,23 @@ class Install(object): os.chdir(self.app_dir) for conf_dir in [self.conf_dir, self.stream_m_conf_dir]: - in_files = os.listdir('conf'+conf_dir) - os.system('cp -ra conf'+ conf_dir + '/*' + ' ' + conf_dir) + in_files = os.listdir('src'+conf_dir) + os.system('cp -ra src'+ conf_dir + '/*' + ' ' + conf_dir) self.chown(conf_dir) - for dir in os.listdir('conf/home'): + for dir in os.listdir('src/home'): 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) + os.system('cp -r src/home/'+dir + '/* ' + home_dir) self.chown(home_dir) - shutil.copy('conf'+self.apache_conf, self.apache_conf) + shutil.copy('src'+self.apache_conf, self.apache_conf) os.system('a2ensite telecaster.conf') os.system('/etc/init.d/apache2 reload') dir = '/etc/pm/' - os.system('cp -r conf' + dir + '* ' + dir) + os.system('cp -r src' + dir + '* ' + dir) def install_init(self): os.chdir(self.app_dir) @@ -130,11 +130,11 @@ class Install(object): for init_dir in self.init_dirs: for daemon in self.daemons: path = init_dir + daemon - shutil.copy('conf'+path, path) + shutil.copy('src'+path, path) os.system('sudo chmod 755 '+path) - os.system('cp -ra conf/usr/* /usr/') - os.system('cp -ra conf/etc/init.d/* /etc/init.d/') + os.system('cp -ra src/usr/* /usr/') + os.system('cp -ra src/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') diff --git a/conf/etc/apache2/sites-available/telecaster.conf b/src/etc/apache2/sites-available/telecaster.conf similarity index 100% rename from conf/etc/apache2/sites-available/telecaster.conf rename to src/etc/apache2/sites-available/telecaster.conf diff --git a/conf/etc/cron.d/telecaster b/src/etc/cron.d/telecaster similarity index 100% rename from conf/etc/cron.d/telecaster rename to src/etc/cron.d/telecaster diff --git a/conf/etc/default/jackd b/src/etc/default/jackd similarity index 100% rename from conf/etc/default/jackd rename to src/etc/default/jackd diff --git a/conf/etc/default/stream-m b/src/etc/default/stream-m similarity index 100% rename from conf/etc/default/stream-m rename to src/etc/default/stream-m diff --git a/conf/etc/default/telecaster b/src/etc/default/telecaster similarity index 100% rename from conf/etc/default/telecaster rename to src/etc/default/telecaster diff --git a/conf/etc/icecast2/icecast.xml b/src/etc/icecast2/icecast.xml similarity index 100% rename from conf/etc/icecast2/icecast.xml rename to src/etc/icecast2/icecast.xml diff --git a/conf/etc/init.d/jackd b/src/etc/init.d/jackd similarity index 100% rename from conf/etc/init.d/jackd rename to src/etc/init.d/jackd diff --git a/conf/etc/init.d/stream-m b/src/etc/init.d/stream-m similarity index 100% rename from conf/etc/init.d/stream-m rename to src/etc/init.d/stream-m diff --git a/conf/etc/init.d/telecaster b/src/etc/init.d/telecaster similarity index 100% rename from conf/etc/init.d/telecaster rename to src/etc/init.d/telecaster diff --git a/conf/etc/init.d/uwsgi b/src/etc/init.d/uwsgi similarity index 100% rename from conf/etc/init.d/uwsgi rename to src/etc/init.d/uwsgi diff --git a/conf/etc/network/if-up.d/reverse_ssh_tunnel b/src/etc/network/if-up.d/reverse_ssh_tunnel similarity index 100% rename from conf/etc/network/if-up.d/reverse_ssh_tunnel rename to src/etc/network/if-up.d/reverse_ssh_tunnel diff --git a/conf/etc/network/if-up.d/telecaster-rsync b/src/etc/network/if-up.d/telecaster-rsync similarity index 100% rename from conf/etc/network/if-up.d/telecaster-rsync rename to src/etc/network/if-up.d/telecaster-rsync diff --git a/conf/etc/nginx/sites-available/telecaster.conf b/src/etc/nginx/sites-available/telecaster.conf similarity index 100% rename from conf/etc/nginx/sites-available/telecaster.conf rename to src/etc/nginx/sites-available/telecaster.conf diff --git a/conf/etc/nginx/uwsgi_params b/src/etc/nginx/uwsgi_params similarity index 100% rename from conf/etc/nginx/uwsgi_params rename to src/etc/nginx/uwsgi_params diff --git a/conf/etc/pm/sleep.d/telecaster_suspend b/src/etc/pm/sleep.d/telecaster_suspend similarity index 100% rename from conf/etc/pm/sleep.d/telecaster_suspend rename to src/etc/pm/sleep.d/telecaster_suspend diff --git a/conf/etc/stream-m/server.conf b/src/etc/stream-m/server.conf similarity index 100% rename from conf/etc/stream-m/server.conf rename to src/etc/stream-m/server.conf diff --git a/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml b/src/etc/telecaster/deefuzzer/telecaster_mp3_default.xml similarity index 100% rename from conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml rename to src/etc/telecaster/deefuzzer/telecaster_mp3_default.xml diff --git a/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml b/src/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml similarity index 100% rename from conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml rename to src/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml diff --git a/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml b/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml similarity index 100% rename from conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml rename to src/etc/telecaster/deefuzzer/telecaster_webm_default.xml diff --git a/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml b/src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml similarity index 100% rename from conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml rename to src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml diff --git a/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack b/src/etc/telecaster/jack-rack/eq_comp_limit_02.rack similarity index 100% rename from conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack rename to src/etc/telecaster/jack-rack/eq_comp_limit_02.rack diff --git a/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack b/src/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack similarity index 100% rename from conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack rename to src/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack diff --git a/conf/etc/telecaster/old/edcast_jack_local.cfg b/src/etc/telecaster/old/edcast_jack_local.cfg similarity index 100% rename from conf/etc/telecaster/old/edcast_jack_local.cfg rename to src/etc/telecaster/old/edcast_jack_local.cfg diff --git a/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg b/src/etc/telecaster/old/edcast_jack_local_mp3.cfg similarity index 100% rename from conf/etc/telecaster/old/edcast_jack_local_mp3.cfg rename to src/etc/telecaster/old/edcast_jack_local_mp3.cfg diff --git a/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg b/src/etc/telecaster/old/edcast_jack_local_ogg.cfg similarity index 100% rename from conf/etc/telecaster/old/edcast_jack_local_ogg.cfg rename to src/etc/telecaster/old/edcast_jack_local_ogg.cfg diff --git a/conf/etc/telecaster/old/telecaster.xml b/src/etc/telecaster/old/telecaster.xml similarity index 100% rename from conf/etc/telecaster/old/telecaster.xml rename to src/etc/telecaster/old/telecaster.xml diff --git a/conf/etc/telecaster/old/telecaster_mp3.xml b/src/etc/telecaster/old/telecaster_mp3.xml similarity index 100% rename from conf/etc/telecaster/old/telecaster_mp3.xml rename to src/etc/telecaster/old/telecaster_mp3.xml diff --git a/conf/etc/telecaster/old/telecaster_ogg.xml b/src/etc/telecaster/old/telecaster_ogg.xml similarity index 100% rename from conf/etc/telecaster/old/telecaster_ogg.xml rename to src/etc/telecaster/old/telecaster_ogg.xml diff --git a/conf/etc/telecaster/old/telecaster_parisson_mp3.xml b/src/etc/telecaster/old/telecaster_parisson_mp3.xml similarity index 100% rename from conf/etc/telecaster/old/telecaster_parisson_mp3.xml rename to src/etc/telecaster/old/telecaster_parisson_mp3.xml diff --git a/conf/etc/telecaster/old/telecaster_pb.xml b/src/etc/telecaster/old/telecaster_pb.xml similarity index 100% rename from conf/etc/telecaster/old/telecaster_pb.xml rename to src/etc/telecaster/old/telecaster_pb.xml diff --git a/conf/etc/telecaster/tests/deefuzzer.xml b/src/etc/telecaster/tests/deefuzzer.xml similarity index 100% rename from conf/etc/telecaster/tests/deefuzzer.xml rename to src/etc/telecaster/tests/deefuzzer.xml diff --git a/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml b/src/etc/telecaster/tests/deefuzzer_audio_safe.xml similarity index 100% rename from conf/etc/telecaster/tests/deefuzzer_audio_safe.xml rename to src/etc/telecaster/tests/deefuzzer_audio_safe.xml diff --git a/conf/etc/telecaster/tests/deefuzzer_ogg.xml b/src/etc/telecaster/tests/deefuzzer_ogg.xml similarity index 100% rename from conf/etc/telecaster/tests/deefuzzer_ogg.xml rename to src/etc/telecaster/tests/deefuzzer_ogg.xml diff --git a/conf/etc/telecaster/tests/deefuzzer_safe.xml b/src/etc/telecaster/tests/deefuzzer_safe.xml similarity index 100% rename from conf/etc/telecaster/tests/deefuzzer_safe.xml rename to src/etc/telecaster/tests/deefuzzer_safe.xml diff --git a/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml b/src/etc/telecaster/tests/deefuzzer_safe_mp3.xml similarity index 100% rename from conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml rename to src/etc/telecaster/tests/deefuzzer_safe_mp3.xml diff --git a/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml b/src/etc/telecaster/tests/deefuzzer_safe_ogg.xml similarity index 100% rename from conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml rename to src/etc/telecaster/tests/deefuzzer_safe_ogg.xml diff --git a/conf/etc/telecaster/tests/deefuzzer_video.xml b/src/etc/telecaster/tests/deefuzzer_video.xml similarity index 100% rename from conf/etc/telecaster/tests/deefuzzer_video.xml rename to src/etc/telecaster/tests/deefuzzer_video.xml diff --git a/conf/etc/telecaster/tests/deefuzzer_video_local.xml b/src/etc/telecaster/tests/deefuzzer_video_local.xml similarity index 100% rename from conf/etc/telecaster/tests/deefuzzer_video_local.xml rename to src/etc/telecaster/tests/deefuzzer_video_local.xml diff --git a/conf/etc/telecaster/tests/deefuzzer_video_safe.xml b/src/etc/telecaster/tests/deefuzzer_video_safe.xml similarity index 100% rename from conf/etc/telecaster/tests/deefuzzer_video_safe.xml rename to src/etc/telecaster/tests/deefuzzer_video_safe.xml diff --git a/conf/etc/telecaster/tests/telecaster_audio_monitor.xml b/src/etc/telecaster/tests/telecaster_audio_monitor.xml similarity index 100% rename from conf/etc/telecaster/tests/telecaster_audio_monitor.xml rename to src/etc/telecaster/tests/telecaster_audio_monitor.xml diff --git a/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml b/src/etc/telecaster/tests/telecaster_audio_monitor2.yaml similarity index 100% rename from conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml rename to src/etc/telecaster/tests/telecaster_audio_monitor2.yaml diff --git a/conf/home/telecaster/.fluxbox/autostart.sh b/src/home/telecaster/.fluxbox/autostart.sh similarity index 100% rename from conf/home/telecaster/.fluxbox/autostart.sh rename to src/home/telecaster/.fluxbox/autostart.sh diff --git a/conf/home/telecaster/.fluxbox/init b/src/home/telecaster/.fluxbox/init similarity index 100% rename from conf/home/telecaster/.fluxbox/init rename to src/home/telecaster/.fluxbox/init diff --git a/conf/home/telecaster/.fluxbox/init.ubuntu b/src/home/telecaster/.fluxbox/init.ubuntu similarity index 100% rename from conf/home/telecaster/.fluxbox/init.ubuntu rename to src/home/telecaster/.fluxbox/init.ubuntu diff --git a/conf/home/telecaster/.fluxbox/scripts/monitor_check.py b/src/home/telecaster/.fluxbox/scripts/monitor_check.py similarity index 100% rename from conf/home/telecaster/.fluxbox/scripts/monitor_check.py rename to src/home/telecaster/.fluxbox/scripts/monitor_check.py diff --git a/conf/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast.sh b/src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast.sh similarity index 100% rename from conf/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast.sh rename to src/home/telecaster/.fluxbox/scripts/tc_audio_mp3_icecast.sh diff --git a/conf/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh similarity index 100% rename from conf/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh rename to src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh diff --git a/conf/home/telecaster/.fluxbox/scripts/telecaster-restart-full b/src/home/telecaster/.fluxbox/scripts/telecaster-restart-full similarity index 100% rename from conf/home/telecaster/.fluxbox/scripts/telecaster-restart-full rename to src/home/telecaster/.fluxbox/scripts/telecaster-restart-full diff --git a/conf/home/telecaster/.fluxbox/startup.ubuntu b/src/home/telecaster/.fluxbox/startup.ubuntu similarity index 100% rename from conf/home/telecaster/.fluxbox/startup.ubuntu rename to src/home/telecaster/.fluxbox/startup.ubuntu diff --git a/conf/home/telecaster/.vnc/xstartup b/src/home/telecaster/.vnc/xstartup similarity index 100% rename from conf/home/telecaster/.vnc/xstartup rename to src/home/telecaster/.vnc/xstartup diff --git a/conf/home/telecaster/media/mp3/silence.mp3 b/src/home/telecaster/media/mp3/silence.mp3 similarity index 100% rename from conf/home/telecaster/media/mp3/silence.mp3 rename to src/home/telecaster/media/mp3/silence.mp3 diff --git a/conf/home/telecaster/media/ogg/silence.ogg b/src/home/telecaster/media/ogg/silence.ogg similarity index 100% rename from conf/home/telecaster/media/ogg/silence.ogg rename to src/home/telecaster/media/ogg/silence.ogg diff --git a/conf/usr/local/bin/telecaster-restart-full b/src/usr/local/bin/telecaster-restart-full similarity index 100% rename from conf/usr/local/bin/telecaster-restart-full rename to src/usr/local/bin/telecaster-restart-full -- 2.39.5