From 40093a593634b26c071a1cbd24b1a77693b36f89 Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Sun, 14 Apr 2024 19:28:39 +0200 Subject: [PATCH] music: Remove shutdown-sound service in favor of soundboard --- roles/music/tasks/soundboard.yaml | 24 -------------------- roles/music/templates/librespot.service | 4 +--- roles/music/templates/nginx-site.conf | 2 ++ roles/music/templates/shutdown-sound.service | 16 ------------- roles/music/templates/shutdown-sound.sh | 8 ------- roles/music/templates/soundboard.service | 2 +- roles/music/templates/soundboard.yaml | 2 ++ roles/music/templates/trollibox.service | 4 +--- roles/music/templates/trollibox.yaml | 2 +- 9 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 roles/music/templates/shutdown-sound.service delete mode 100644 roles/music/templates/shutdown-sound.sh diff --git a/roles/music/tasks/soundboard.yaml b/roles/music/tasks/soundboard.yaml index ae29422..a7d1f6b 100644 --- a/roles/music/tasks/soundboard.yaml +++ b/roles/music/tasks/soundboard.yaml @@ -46,27 +46,3 @@ state: started enabled: true daemon_reload: true - -- name: Install shutdown sound script - template: - src: shutdown-sound.sh - dest: /opt/shutdown-sound.sh - owner: root - group: root - mode: 0644 - -- name: Install shutdown sound service - template: - src: shutdown-sound.service - dest: /etc/systemd/system/shutdown-sound.service - owner: root - group: root - mode: 0644 - notify: daemon reload - -- name: Enable shutdown-sound - systemd: - name: shutdown-sound - state: started - enabled: true - daemon_reload: true diff --git a/roles/music/templates/librespot.service b/roles/music/templates/librespot.service index c66da9c..8d3b683 100644 --- a/roles/music/templates/librespot.service +++ b/roles/music/templates/librespot.service @@ -1,6 +1,4 @@ -# -# Managed by Ansible -# +# {{ ansible_managed }} [Unit] Description=Spotify through Librespot diff --git a/roles/music/templates/nginx-site.conf b/roles/music/templates/nginx-site.conf index 6ed4945..185d689 100644 --- a/roles/music/templates/nginx-site.conf +++ b/roles/music/templates/nginx-site.conf @@ -1,3 +1,5 @@ +# {{ ansible_managed }} + server { listen 80 default_server; listen [::]:80 default_server; diff --git a/roles/music/templates/shutdown-sound.service b/roles/music/templates/shutdown-sound.service deleted file mode 100644 index 6c6de88..0000000 --- a/roles/music/templates/shutdown-sound.service +++ /dev/null @@ -1,16 +0,0 @@ -# Managed by Ansible - -[Unit] -Description=Goodbye -Requires=mpd.service - -[Service] -Type=oneshot -ExecStart=/bin/true -ExecStop=/opt/shutdown.sh -RemainAfterExit=true -User=audio -Group=audio - -[Install] -WantedBy=multi-user.target diff --git a/roles/music/templates/shutdown-sound.sh b/roles/music/templates/shutdown-sound.sh deleted file mode 100644 index 9346f74..0000000 --- a/roles/music/templates/shutdown-sound.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# Managed by Ansible - -systemctl stop trollibox.service -mpc clear - -su audio -c 'mplayer -volume 10 -ao jack:name=MPlayer /opt/sounds/shutdown.mp3' diff --git a/roles/music/templates/soundboard.service b/roles/music/templates/soundboard.service index f362fec..38b31ab 100644 --- a/roles/music/templates/soundboard.service +++ b/roles/music/templates/soundboard.service @@ -1,4 +1,4 @@ -# Managed by Ansible +# {{ ansible_managed }} [Unit] Description=MQTT Soundboard diff --git a/roles/music/templates/soundboard.yaml b/roles/music/templates/soundboard.yaml index b253086..106dc30 100644 --- a/roles/music/templates/soundboard.yaml +++ b/roles/music/templates/soundboard.yaml @@ -1,3 +1,5 @@ +# {{ ansible_managed }} + loglevel: INFO mqtt: diff --git a/roles/music/templates/trollibox.service b/roles/music/templates/trollibox.service index 938369a..ddddd2f 100644 --- a/roles/music/templates/trollibox.service +++ b/roles/music/templates/trollibox.service @@ -1,6 +1,4 @@ -# -# Managed by Ansible -# +# {{ ansible_managed }} [Unit] Description=Trollibox diff --git a/roles/music/templates/trollibox.yaml b/roles/music/templates/trollibox.yaml index d3fab0b..2699343 100644 --- a/roles/music/templates/trollibox.yaml +++ b/roles/music/templates/trollibox.yaml @@ -1,4 +1,4 @@ -# Managed by Ansible +# {{ ansible_managed }} # The network address to listen on. Must be in the Go listen format. #