From e595328fc1547e4f481e274ffa7b4b94582a46ac Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Wed, 28 Sep 2022 22:33:05 -0400
Subject: [PATCH] Simplified azuracast/tasks/install.yml

---
 roles/azuracast/tasks/install.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/roles/azuracast/tasks/install.yml b/roles/azuracast/tasks/install.yml
index 89e611376..1de892984 100644
--- a/roles/azuracast/tasks/install.yml
+++ b/roles/azuracast/tasks/install.yml
@@ -7,13 +7,11 @@
   template:
     src: prod.env.j2
     dest: "{{ azuracast_host_dir }}/.env"
-    #mode: 0644
 
-#- name: AzuraCast - Install {{ azuracast_host_dir }}/docker-compose.override.yml from template
-#  template:
-#    src: docker-compose.override.yml.j2
-#    dest: "{{ azuracast_host_dir }}/docker-compose.override.yml"
-#    mode: 0644
+- name: AzuraCast - Install {{ azuracast_host_dir }}/azuracast.env for altered ports
+  template:
+    src: azuracast.env.j2
+    dest: "{{ azuracast_host_dir }}/azuracast.env"
 
 - name: AzuraCast - Download {{ docker_sh_url }} to {{ azuracast_host_dir }}
   get_url:
@@ -22,14 +20,18 @@
     mode: 0755
     timeout: "{{ download_timeout }}"
 
+#- name: AzuraCast - Install {{ azuracast_host_dir }}/docker-compose.override.yml from template
+#  template:
+#    src: docker-compose.override.yml.j2
+#    dest: "{{ azuracast_host_dir }}/docker-compose.override.yml"
+
 # 2022-09-28: https://docs.azuracast.com/en/getting-started/installation/docker
-# suggests this step might not be necessary.
+# (& testing) confirm this is done automatically by 'docker.sh install' below.
 #
 # - name: AzuraCast - Download AzuraCast's docker-compose.yml sample from GitHub to {{ azuracast_host_dir }}
 #   get_url:
 #     url: "{{ docker_compose_url }}"
 #     dest: "{{ azuracast_host_dir }}/docker-compose.yml"
-#     mode: 0755
 #     timeout: "{{ download_timeout }}"
 
 #- name: AzuraCast - Make changes to docker.sh script so it runs headless
@@ -45,12 +47,6 @@
 #    regexp: "^( *- \\')8([0-9]{3})\\:8([0-9]{3}\\'.*)$"
 #    replace: "\\g<1>{{ azuracast_port_range_prefix }}\\g<2>:{{ azuracast_port_range_prefix }}\\g<3>"
 
-- name: AzuraCast - Install {{ azuracast_host_dir }}/azuracast.env for altered ports
-  template:
-    src: azuracast.env.j2
-    dest: "{{ azuracast_host_dir }}/azuracast.env"
-    #mode: 0644
-
 - name: AzuraCast - Make directory {{ docker_container_dir }}
   file:
     path: "{{ docker_container_dir }}"