iadd doubls nostreaming conf, rename yaml to yml

diff --git a/etc/telecaster/deefuzzer/telecaster_mp3_default_nostreaming.yml b/etc/telecaster/deefuzzer/telecaster_mp3_default_nostreaming.yml
new file mode 100644 (file)
index 0000000..3bad596
--- /dev/null
+++ b/etc/telecaster/deefuzzer/telecaster_mp3_default_nostreaming.yml
@@ -0,0 +1,46 @@
+deefuzzer:
+  log: /var/log/telecaster/deefuzzer_mp3_station.log
+  m3u: /var/www/m3u/telecaster_mp3.m3u
+  station:
+    control:
+      mode: '1'
+      port: '16003'
+    infos:
+      description: TeleCaster safe local live audio record
+      genre: Vocal
+      name: TeleCaster Localhost Live Safe Recorder
+      short_name: telecaster_live_safe
+      url: https://www.pre-barreau.com
+    jingles:
+      dir: /path/to/jingles
+      mode: '0'
+      shuffle: '1'
+    media:
+      bitrate: '96'
+      dir: /usr/local/share/telecaster/media/mp3
+      format: mp3
+      ogg_quality: '7'
+      samplerate: '48000'
+      shuffle: '1'
+      voices: '2'
+    record:
+      dir: /home/telecaster/archives
+      mode: '1'
+    relay:
+      author: Parisson
+      mode: '1'
+      url: http://127.0.0.1:8000/telecaster_live.mp3
+    rss:
+      dir: /var/www/rss
+      enclosure: '0'
+    server:
+      host: 127.0.0.1
+      port: '8000'
+      public: '0'
+      sourcepassword: source2parisson
+      type: icecast
+    twitter:
+      key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE
+      mode: '0'
+      secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4
+      tags: bla bla

diff --git a/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml b/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml
deleted file mode 100644 (file)
index bd8f376..0000000
--- a/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-deefuzzer:
-  log: /var/log/telecaster/telecaster_mp3_monitor.log
-  m3u: /var/www/m3u/telecaster_mp3_monitor.m3u
-  station:
-    control: {mode: 1, port: 16001}
-    infos: {description: TeleCaster MP3 monitor,
-            genre: Vocal,
-            name: monitor.mp3,
-            short_name: monitor.mp3,
-            url: 'https://www.parisson.com'}
-    jingles: {dir: /path/to/jingles, mode: 0, shuffle: 1}
-    media: {bitrate: 96,
-            dir: /usr/local/share/telecaster/media/mp3,
-            format: mp3, ogg_quality: 4,
-            samplerate: 48000, shuffle: 0, voices: '2'}
-    record: {dir: /home/telecaster/trash/mp3, mode: 1}
-    relay: {author: Inconnu, mode: 1,
-            url: 'http://127.0.0.1:8000/telecaster_live.mp3'}
-    rss: {dir: /var/www/rss, enclosure: 0,
-          media_url: 'http://localhost/rss/'}
-    server: {host: 127.0.0.1, mountpoint: monitor.mp3,
-             port: 8000, public: 0,
-             sourcepassword: source2parisson, type: icecast}
-    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE,
-              mode: 0, secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
-              tags: bla bla}

diff --git a/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yml b/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yml
new file mode 100644 (file)
index 0000000..bd8f376
--- /dev/null
+++ b/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yml
@@ -0,0 +1,26 @@
+deefuzzer:
+  log: /var/log/telecaster/telecaster_mp3_monitor.log
+  m3u: /var/www/m3u/telecaster_mp3_monitor.m3u
+  station:
+    control: {mode: 1, port: 16001}
+    infos: {description: TeleCaster MP3 monitor,
+            genre: Vocal,
+            name: monitor.mp3,
+            short_name: monitor.mp3,
+            url: 'https://www.parisson.com'}
+    jingles: {dir: /path/to/jingles, mode: 0, shuffle: 1}
+    media: {bitrate: 96,
+            dir: /usr/local/share/telecaster/media/mp3,
+            format: mp3, ogg_quality: 4,
+            samplerate: 48000, shuffle: 0, voices: '2'}
+    record: {dir: /home/telecaster/trash/mp3, mode: 1}
+    relay: {author: Inconnu, mode: 1,
+            url: 'http://127.0.0.1:8000/telecaster_live.mp3'}
+    rss: {dir: /var/www/rss, enclosure: 0,
+          media_url: 'http://localhost/rss/'}
+    server: {host: 127.0.0.1, mountpoint: monitor.mp3,
+             port: 8000, public: 0,
+             sourcepassword: source2parisson, type: icecast}
+    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE,
+              mode: 0, secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
+              tags: bla bla}

diff --git a/etc/telecaster/deefuzzer/telecaster_webm_default_double_nostreaming.yml b/etc/telecaster/deefuzzer/telecaster_webm_default_double_nostreaming.yml
new file mode 100644 (file)
index 0000000..bb3be8f
--- /dev/null
+++ b/etc/telecaster/deefuzzer/telecaster_webm_default_double_nostreaming.yml
@@ -0,0 +1,88 @@
+deefuzzer:
+  log: /var/log/telecaster/deefuzzer_webm_station_prod.log
+  m3u: /var/www/m3u/telecaster_webm_prod.m3u
+  station:
+  - control:
+      mode: '1'
+      port: '16013'
+    infos:
+      description: TeleCaster safe local live video record
+      genre: Vocal
+      name: TeleCaster Localhost Live Safe Recorder
+      short_name: telecaster_live_safe
+      url: https://www.pre-barreau.com
+    jingles:
+      dir: /path/to/jingles
+      mode: '0'
+      shuffle: '1'
+    media:
+      bitrate: '1000'
+      dir: /usr/local/share/telecaster/media/webm
+      format: webm
+      ogg_quality: '7'
+      samplerate: '48000'
+      shuffle: '1'
+      voices: '2'
+    record:
+      dir: /home/telecaster/archives
+      mode: '1'
+    relay:
+      author: Parisson
+      mode: '1'
+      url: http://127.0.0.1:8000/telecaster_live_0.webm
+    rss:
+      dir: /var/www/rss
+      enclosure: '0'
+    server:
+      host: 127.0.0.1
+      port: '8000'
+      public: '0'
+      sourcepassword: source2parisson
+      type: icecast
+    twitter:
+      key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE
+      mode: '0'
+      secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4
+      tags: bla bla
+  - control:
+      mode: '1'
+      port: '16015'
+    infos:
+      description: TeleCaster safe local live video record
+      genre: Vocal
+      name: TeleCaster Localhost Live Safe Recorder
+      short_name: telecaster_live_safe
+      url: https://www.pre-barreau.com
+    jingles:
+      dir: /path/to/jingles
+      mode: '0'
+      shuffle: '1'
+    media:
+      bitrate: '1000'
+      dir: /usr/local/share/telecaster/media/webm
+      format: webm
+      ogg_quality: '7'
+      samplerate: '48000'
+      shuffle: '1'
+      voices: '2'
+    record:
+      dir: /home/telecaster/archives
+      mode: '1'
+    relay:
+      author: Parisson
+      mode: '1'
+      url: http://127.0.0.1:8000/telecaster_live_2.webm
+    rss:
+      dir: /var/www/rss
+      enclosure: '0'
+    server:
+      host: 127.0.0.1
+      port: '8000'
+      public: '0'
+      sourcepassword: source2parisson
+      type: icecast
+    twitter:
+      key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE
+      mode: '0'
+      secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4
+      tags: bla bla
\ No newline at end of file

diff --git a/etc/telecaster/deefuzzer/telecaster_webm_default_nostreaming.yml b/etc/telecaster/deefuzzer/telecaster_webm_default_nostreaming.yml
new file mode 100644 (file)
index 0000000..20e3adc
--- /dev/null
+++ b/etc/telecaster/deefuzzer/telecaster_webm_default_nostreaming.yml
@@ -0,0 +1,46 @@
+deefuzzer:
+  log: /var/log/telecaster/deefuzzer_webm_prod.log
+  m3u: /var/www/m3u/telecaster_webm_prod.m3u
+  station:
+    control:
+      mode: '1'
+      port: '16006'
+    infos:
+      description: crfpa-droit-international-prive-cours
+      genre: Oral
+      name: crfpa-droit-international-prive-cours
+      short_name: crfpa-droit-international-prive-cours
+      url: https://www.pre-barreau.com
+    jingles:
+      dir: /path/to/jingles
+      mode: '0'
+      shuffle: '0'
+    media:
+      bitrate: '600'
+      dir: /usr/local/share/telecaster/media/webm
+      format: webm
+      ogg_quality: '7'
+      samplerate: '48000'
+      shuffle: '0'
+      voices: '2'
+    record:
+      dir: /home/telecaster/archives
+      mode: '1'
+    relay:
+      author: Parisson
+      mode: '1'
+      url: http://127.0.0.1:8000/telecaster_live.webm
+    rss:
+      dir: /var/www/rss
+      enclosure: '0'
+    server:
+      host: 127.0.0.1
+      port: '8000'
+      public: '0'
+      sourcepassword: source2parisson
+      type: icecast
+    twitter:
+      key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE
+      mode: '0'
+      secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4
+      tags: bla bla

diff --git a/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml b/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml
deleted file mode 100644 (file)
index 8ce7c84..0000000
--- a/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-deefuzzer:
-  log: /var/log/telecaster/telecaster_webm_monitor.log
-  m3u: /var/www/m3u/telecaster_webm_monitor.m3u
-  station:
-    control: {mode: 1, port: 16002}
-    infos: {description: TeleCaster WebM monitor stream, genre: Vocal, name: monitor_1.webm, short_name: monitor_1.webm,
-      url: 'https://www.parisson.com'}
-    jingles: {dir: /path/to/jingles, mode: '0', shuffle: '0'}
-    media: {bitrate: '512', dir: /usr/local/share/telecaster/media/webm, format: webm, ogg_quality: '4',
-      samplerate: '48000', shuffle: '0', voices: '1'}
-    record: {dir: /home/telecaster/trash/webm/1, mode: 1}
-    relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:8000/telecaster_live_1.webm'}
-    rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://localhost/rss/'}
-    server: {host: 127.0.0.1, port: '8000', public: '0', sourcepassword: source2parisson,
-      type: icecast, mountpoint: monitor_1.webm}
-    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
-      tags: bla bla}

diff --git a/etc/telecaster/deefuzzer/telecaster_webm_monitor.yml b/etc/telecaster/deefuzzer/telecaster_webm_monitor.yml
new file mode 100644 (file)
index 0000000..8ce7c84
--- /dev/null
+++ b/etc/telecaster/deefuzzer/telecaster_webm_monitor.yml
@@ -0,0 +1,17 @@
+deefuzzer:
+  log: /var/log/telecaster/telecaster_webm_monitor.log
+  m3u: /var/www/m3u/telecaster_webm_monitor.m3u
+  station:
+    control: {mode: 1, port: 16002}
+    infos: {description: TeleCaster WebM monitor stream, genre: Vocal, name: monitor_1.webm, short_name: monitor_1.webm,
+      url: 'https://www.parisson.com'}
+    jingles: {dir: /path/to/jingles, mode: '0', shuffle: '0'}
+    media: {bitrate: '512', dir: /usr/local/share/telecaster/media/webm, format: webm, ogg_quality: '4',
+      samplerate: '48000', shuffle: '0', voices: '1'}
+    record: {dir: /home/telecaster/trash/webm/1, mode: 1}
+    relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:8000/telecaster_live_1.webm'}
+    rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://localhost/rss/'}
+    server: {host: 127.0.0.1, port: '8000', public: '0', sourcepassword: source2parisson,
+      type: icecast, mountpoint: monitor_1.webm}
+    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
+      tags: bla bla}

diff --git a/etc/telecaster/deefuzzer/telecaster_webm_monitor_double.yaml b/etc/telecaster/deefuzzer/telecaster_webm_monitor_double.yaml
deleted file mode 100644 (file)
index 4bc9496..0000000
--- a/etc/telecaster/deefuzzer/telecaster_webm_monitor_double.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-deefuzzer:
-  log: /var/log/telecaster/telecaster_webm_monitor.log
-  m3u: /var/www/m3u/telecaster_webm_monitor.m3u
-  station:
-   -
-    control: {mode: 1, port: 16002}
-    infos: {description: TeleCaster WebM monitor stream, genre: Vocal, name: monitor_0.webm, short_name: monitor_0.webm,
-      url: 'https://www.parisson.com'}
-    jingles: {dir: /path/to/jingles, mode: '0', shuffle: '0'}
-    media: {bitrate: '512', dir: /usr/local/share/telecaster/media/webm, format: webm, ogg_quality: '4',
-      samplerate: '48000', shuffle: '0', voices: '1'}
-    record: {dir: /home/telecaster/trash/webm/1, mode: 1}
-    relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:8000/telecaster_live_0.webm'}
-    rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://localhost/rss/'}
-    server: {host: 127.0.0.1, port: '8000', public: '0', sourcepassword: source2parisson,
-      type: icecast, mountpoint: monitor_0.webm}
-    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
-      tags: bla bla}
-   -
-    control: {mode: 1, port: 16003}
-    infos: {description: TeleCaster WebM monitor stream, genre: Vocal, name: monitor_2.webm, short_name: monitor_2.webm,
-      url: 'https://www.parisson.com'}
-    jingles: {dir: /path/to/jingles, mode: '0', shuffle: '0'}
-    media: {bitrate: '512', dir: /usr/local/share/telecaster/media/webm, format: webm, ogg_quality: '4',
-      samplerate: '48000', shuffle: '0', voices: '1'}
-    record: {dir: /home/telecaster/trash/webm/2, mode: 1}
-    relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:8000/telecaster_live_2.webm'}
-    rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://localhost/rss/'}
-    server: {host: 127.0.0.1, port: '8000', public: '0', sourcepassword: source2parisson,
-      type: icecast, mountpoint: monitor_2.webm}
-    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
-      tags: bla bla}

diff --git a/etc/telecaster/deefuzzer/telecaster_webm_monitor_double.yml b/etc/telecaster/deefuzzer/telecaster_webm_monitor_double.yml
new file mode 100644 (file)
index 0000000..4bc9496
--- /dev/null
+++ b/etc/telecaster/deefuzzer/telecaster_webm_monitor_double.yml
@@ -0,0 +1,32 @@
+deefuzzer:
+  log: /var/log/telecaster/telecaster_webm_monitor.log
+  m3u: /var/www/m3u/telecaster_webm_monitor.m3u
+  station:
+   -
+    control: {mode: 1, port: 16002}
+    infos: {description: TeleCaster WebM monitor stream, genre: Vocal, name: monitor_0.webm, short_name: monitor_0.webm,
+      url: 'https://www.parisson.com'}
+    jingles: {dir: /path/to/jingles, mode: '0', shuffle: '0'}
+    media: {bitrate: '512', dir: /usr/local/share/telecaster/media/webm, format: webm, ogg_quality: '4',
+      samplerate: '48000', shuffle: '0', voices: '1'}
+    record: {dir: /home/telecaster/trash/webm/1, mode: 1}
+    relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:8000/telecaster_live_0.webm'}
+    rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://localhost/rss/'}
+    server: {host: 127.0.0.1, port: '8000', public: '0', sourcepassword: source2parisson,
+      type: icecast, mountpoint: monitor_0.webm}
+    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
+      tags: bla bla}
+   -
+    control: {mode: 1, port: 16003}
+    infos: {description: TeleCaster WebM monitor stream, genre: Vocal, name: monitor_2.webm, short_name: monitor_2.webm,
+      url: 'https://www.parisson.com'}
+    jingles: {dir: /path/to/jingles, mode: '0', shuffle: '0'}
+    media: {bitrate: '512', dir: /usr/local/share/telecaster/media/webm, format: webm, ogg_quality: '4',
+      samplerate: '48000', shuffle: '0', voices: '1'}
+    record: {dir: /home/telecaster/trash/webm/2, mode: 1}
+    relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:8000/telecaster_live_2.webm'}
+    rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://localhost/rss/'}
+    server: {host: 127.0.0.1, port: '8000', public: '0', sourcepassword: source2parisson,
+      type: icecast, mountpoint: monitor_2.webm}
+    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
+      tags: bla bla}