2 files changed, 27 insertions, 27 deletions
diff --git a/roles/stream/tasks/main.yml b/roles/stream/tasks/main.yml
index d741c72..941ac92 100644
--- a/roles/stream/tasks/main.yml
+++ b/roles/stream/tasks/main.yml
@@ -13,27 +13,8 @@
     path: "{{ icecast_restream_dir }}"
     owner: "{{ icecast_user }}"
     state: directory
-- name: Debug
-  debug:
-    var: item.id
-  loop: "{{ emacsconf_tracks }}"
-- name: Copy the lowres restreaming shell script
-  template:
-    src: lowres.sh
-    dest: /usr/local/bin/{{ emacsconf_id }}-lowres-{{ item.id }}.sh
-    mode: 0755
-  loop: "{{ emacsconf_tracks }}"
-- name: Copy lowres on-connect
-  template:
-    src: on-connect
-    dest: /usr/local/bin/{{ emacsconf_id }}-lowres-{{ item.id }}-on-connect
-    mode: 0755
-  loop: "{{ emacsconf_tracks }}"
-- name: Copy lowres on-disconnect
-  template:
-    src: on-disconnect
-    dest: /usr/local/bin/{{ emacsconf_id }}-lowres-{{ item.id }}-on-disconnect
-    mode: 0755
+- name: Set up track-specific things
+  include: track.yml
   loop: "{{ emacsconf_tracks }}"
 - name: Set up init file
   become: true
@@ -73,9 +54,11 @@
 - name: Try to restart icecast if not started
   service: name=emacsconf state=started enabled=yes
   when: port_check.failed == true
-# - name: Set up restream script
-#   template:
-#     src: restream-yt.sh
-#     dest: /home/orga/restream-yt.sh
-#     owner: orga
-#     mode: 0755
+- name: Set up restream scripts
+  tags: restream
+  template:
+    src: restream.sh
+    dest: /home/orga/restream-{{ item[1].name }}-{{ item[0].name }}.sh
+    owner: orga
+    mode: 0755
+  loop: "{{ restreaming_platforms | subelements('streams') | list }}"
diff --git a/roles/stream/tasks/track.yml b/roles/stream/tasks/track.yml
new file mode 100644
index 0000000..d1e8204
--- /dev/null
+++ b/roles/stream/tasks/track.yml
@@ -0,0 +1,17 @@
+- name: Copy the lowres restreaming shell script
+  template:
+    src: lowres.sh
+    dest: /usr/local/bin/{{ emacsconf_id }}-lowres-{{ item.id }}.sh
+    mode: 0755
+- name: Copy lowres on-connect
+  template:
+    src: on-connect
+    dest: /usr/local/bin/{{ emacsconf_id }}-lowres-{{ item.id }}-on-connect
+    mode: 0755
+- name: Copy lowres on-disconnect
+  template:
+    src: on-disconnect
+    dest: /usr/local/bin/{{ emacsconf_id }}-lowres-{{ item.id }}-on-disconnect
+    mode: 0755
+
+