From e9564cab3613e7b53bfab7a2e68740a7a86c28d7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 31 Aug 2022 16:07:19 -0400 Subject: [PATCH 1/4] azuracast/tasks/main.yml: skip_role_on_error --- roles/azuracast/tasks/main.yml | 43 ++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/roles/azuracast/tasks/main.yml b/roles/azuracast/tasks/main.yml index ef9c28914..c4e69ec0c 100644 --- a/roles/azuracast/tasks/main.yml +++ b/roles/azuracast/tasks/main.yml @@ -19,25 +19,32 @@ quiet: yes -- name: Install AzuraCast if 'azuracast_installed' not defined, e.g. in {{ iiab_state_file }} # /etc/iiab/iiab_state.yml - include_tasks: install.yml - when: azuracast_installed is undefined +- block: + - name: Install AzuraCast if 'azuracast_installed' not defined, e.g. in {{ iiab_state_file }} # /etc/iiab/iiab_state.yml + include_tasks: install.yml + when: azuracast_installed is undefined -# TODO figure out what to turn off/on for AzuraCast -# - include_tasks: enable-or-disable.yml + # TODO figure out what to turn off/on for AzuraCast + # - include_tasks: enable-or-disable.yml + - name: Add 'azuracast' variable values to {{ iiab_ini_file }} + ini_file: + path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini + section: azuracast + option: "{{ item.option }}" + value: "{{ item.value | string }}" + with_items: + - option: name + value: azuracast + - option: description + value: '"AzuraCast is a self-hosted, all-in-one radio station platform. Use AzuraCast to schedule podcasts, music, and even do live streaming of audio content. A variety of streaming formats are supported."' + - option: enabled + value: "{{ azuracast_enabled }}" -- name: Add 'azuracast' variable values to {{ iiab_ini_file }} - ini_file: - path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini - section: azuracast - option: "{{ item.option }}" - value: "{{ item.value | string }}" - with_items: - - option: name - value: azuracast - - option: description - value: '"AzuraCast is a self-hosted, all-in-one radio station platform. Use AzuraCast to schedule podcasts, music, and even do live streaming of audio content. A variety of streaming formats are supported."' - - option: enabled - value: "{{ azuracast_enabled }}" + rescue: + + - name: 'SEE ERROR ABOVE (skip_role_on_error: {{ skip_role_on_error }})' + fail: + msg: "" + when: not skip_role_on_error From 2927f086a2a7443f843db3e7521be8de71d68660 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 31 Aug 2022 16:19:32 -0400 Subject: [PATCH 2/4] azuracast/tasks/main.yml: Tighter iiab.ini description --- roles/azuracast/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/azuracast/tasks/main.yml b/roles/azuracast/tasks/main.yml index c4e69ec0c..2fe95b682 100644 --- a/roles/azuracast/tasks/main.yml +++ b/roles/azuracast/tasks/main.yml @@ -38,7 +38,7 @@ - option: name value: azuracast - option: description - value: '"AzuraCast is a self-hosted, all-in-one radio station platform. Use AzuraCast to schedule podcasts, music, and even do live streaming of audio content. A variety of streaming formats are supported."' + value: '"AzuraCast is simple, self-hosted web radio. Use it to schedule student newscasts, podcasts, music (e.g. MP3's and similar) and even do live-streaming."' - option: enabled value: "{{ azuracast_enabled }}" From 20ed74ea517ef82b63b366d24e66cc1ebbdcf5ac Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 31 Aug 2022 16:22:04 -0400 Subject: [PATCH 3/4] azuracast/tasks/main.yml: iiab.ini description needs '' --- roles/azuracast/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/azuracast/tasks/main.yml b/roles/azuracast/tasks/main.yml index 2fe95b682..6bc11b878 100644 --- a/roles/azuracast/tasks/main.yml +++ b/roles/azuracast/tasks/main.yml @@ -38,7 +38,7 @@ - option: name value: azuracast - option: description - value: '"AzuraCast is simple, self-hosted web radio. Use it to schedule student newscasts, podcasts, music (e.g. MP3's and similar) and even do live-streaming."' + value: '"AzuraCast is simple, self-hosted web radio. Use it to schedule student newscasts, podcasts, music (e.g. MP3''s and similar) and even do live-streaming."' - option: enabled value: "{{ azuracast_enabled }}" From 85e7d30e452b8a55d48f45197123fc9e6d24271f Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 31 Aug 2022 16:27:29 -0400 Subject: [PATCH 4/4] test.yml: Clarify '' to escape single quotes in 7 iiab.ini descriptions --- test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.yml b/test.yml index 032d35f23..ab0aeac9c 100644 --- a/test.yml +++ b/test.yml @@ -25,7 +25,7 @@ #- pause: - - name: DOUBLE UP to escape single quotes... '"''"' e.g. iiab.ini Munin description + - name: DOUBLE UP to escape single quotes... '"''"' e.g. iiab.ini descriptions for azuracast, captiveportal, mosquitto, munin, nodejs, osm-vector-maps, sshd debug: msg: '"''"' # FAILS: '"\'"'