From 8b1212b95697ffb155ba1a0e38f344124ccca311 Mon Sep 17 00:00:00 2001
From: Paul Bovbel <paul@bovbel.com>
Date: Wed, 26 Jun 2024 21:57:54 -0400
Subject: [PATCH] Fix docker service stop

---
 roles/docker/handlers/configure-docker.yaml |  8 +++++++-
 roles/docker/templates/container.service.j2 |  3 ++-
 roles/media-server/handlers/main.yaml       | 20 +++++++++++++++-----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/roles/docker/handlers/configure-docker.yaml b/roles/docker/handlers/configure-docker.yaml
index 6ae4499..58c0c90 100644
--- a/roles/docker/handlers/configure-docker.yaml
+++ b/roles/docker/handlers/configure-docker.yaml
@@ -11,6 +11,12 @@
     dest: /etc/docker/docker-compose.yaml
   become: true
 
+- name: stop docker
+  service:
+    name: docker
+    state: stopped
+  become: true
+
 - name: configure containers
   shell: |
     cd /etc/docker &&
@@ -71,7 +77,7 @@
   #   enabled: true
   #   state: started
   become: true
-  when: "{{ service.value['x-systemd-enabled'] | default(true) }}"
+  when: service.value['x-systemd-enabled'] | default(true)
   no_log: "{{ docker_no_log }}"
   loop: "{{ docker.services | dict2items }}"
   loop_control:
diff --git a/roles/docker/templates/container.service.j2 b/roles/docker/templates/container.service.j2
index 2b690f3..7e55098 100644
--- a/roles/docker/templates/container.service.j2
+++ b/roles/docker/templates/container.service.j2
@@ -1,7 +1,7 @@
 # {{ ansible_managed }}
 
 [Unit]
-Description=Start docker container {{ service.key }}
+Description=Docker container {{ service.key }}
 Wants=network-online.target
 Before=default.target
 BindsTo=docker.service {{ service.value['x-systemd-requires'] | default([]) | join(' ') }}
@@ -9,6 +9,7 @@ After=docker.service {{ service.value['x-systemd-requires'] | default([]) | join
 
 [Service]
 ExecStart=/usr/bin/docker start {{ service.key }} -a
+ExecStop=/usr/bin/docker stop {{ service.key }}
 Type=simple
 SyslogIdentifier={{ service.key }}
 Restart=on-failure
diff --git a/roles/media-server/handlers/main.yaml b/roles/media-server/handlers/main.yaml
index 939aabc..5699cba 100644
--- a/roles/media-server/handlers/main.yaml
+++ b/roles/media-server/handlers/main.yaml
@@ -6,23 +6,33 @@
   become: true
 
 - name: restart sonarr
-  shell: docker restart sonarr
+  service:
+    name: sonarr
+    state: restarted
   become: true
 
 - name: restart radarr
-  shell: docker restart radarr
+  service:
+    name: radarr
+    state: restarted
   become: true
 
 - name: restart jackett
-  shell: docker restart jackett
+  service:
+    name: jackett
+    state: restarted
   become: true
 
 - name: restart deluge
-  shell: docker restart deluge
+  service:
+    name: deluge
+    state: restarted
   become: true
 
 - name: restart tautulli
-  shell: docker restart tautulli
+  service:
+    name: tautulli
+    state: restarted
   become: true
 
 - name: enable cleanup-downloads