qbittorrent: use saltbox managed naming for service

roles/qbittorrent/defaults/main.yml

@@ -39,6 +39,8 @@ qbittorrent_host_release_lookup: "{{ qbittorrent_host_lookup_libtorrent2
 qbittorrent_host_version: |
   curl -sL {{ qbittorrent_host_release_url }} | jq -r '. | "{{ qbittorrent_host_release_lookup }}"'
 
+qbittorent_service_name: "saltbox_managed_{{ qbittorrent_name }}.service"
+
 ################################
 # Paths
 ################################

roles/qbittorrent/tasks/main2.yml

@@ -21,20 +21,29 @@
 - name: Remove existing Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"
 
-- name: Check if '{{ qbittorrent_name }}.service' exists
+- name: Check if legacy '{{ qbittorrent_name }}.service' exists
   ansible.builtin.stat:
     path: "/etc/systemd/system/{{ qbittorrent_name }}.service"
+  register: qbittorrent_legacy_service
+
+- name: "Execute legacy tasks"
+  ansible.builtin.include_tasks: subtasks/legacy.yml
+  when: qbittorrent_legacy_service.stat.exists
+
+- name: Check if '{{ qbittorent_service_name }}' exists
+  ansible.builtin.stat:
+    path: "/etc/systemd/system/{{ qbittorent_service_name }}"
   register: qbittorrent_service
 
-- name: Stop '{{ qbittorrent_name }}.service'
+- name: Stop '{{ qbittorent_service_name }}'
   ansible.builtin.systemd:
-    name: "{{ qbittorrent_name }}.service"
+    name: "{{ qbittorent_service_name }}"
     state: stopped
   when: qbittorrent_service.stat.exists
 
-- name: Remove '{{ qbittorrent_name }}.service' file
+- name: Remove '{{ qbittorent_service_name }}' file
   ansible.builtin.file:
-    path: "/etc/systemd/system/{{ qbittorrent_name }}.service"
+    path: "/etc/systemd/system/{{ qbittorent_service_name }}"
     state: absent
   when: qbittorrent_service.stat.exists and not qbittorrent_host_install
 
@@ -80,20 +89,20 @@
     - name: Import '{{ qbittorrent_name }}.service'
       ansible.builtin.template:
         src: "qbittorrent.service.j2"
-        dest: "/etc/systemd/system/{{ qbittorrent_name }}.service"
+        dest: "/etc/systemd/system/{{ qbittorent_service_name }}"
         mode: "0755"
         force: true
 
-    - name: Systemd daemon-reload '{{ qbittorrent_name }}.service'
+    - name: Systemd daemon-reload '{{ qbittorent_service_name }}'
       ansible.builtin.systemd:
-        name: "{{ qbittorrent_name }}.service"
+        name: "{{ qbittorent_service_name }}"
         state: stopped
         enabled: false
         daemon_reload: true
 
-    - name: Start '{{ qbittorrent_name }}.service'
+    - name: Start '{{ qbittorent_service_name }}'
       ansible.builtin.systemd:
-        name: "{{ qbittorrent_name }}.service"
+        name: "{{ qbittorent_service_name }}"
         state: started
         enabled: true
 

roles/qbittorrent/tasks/subtasks/legacy.yml

@@ -0,0 +1,18 @@
+#########################################################################
+# Title:         Saltbox: qBittorrent | Legacy Tasks                    #
+# Author(s):     salty                                                  #
+# URL:           https://github.com/saltyorg/Saltbox                    #
+# --                                                                    #
+#########################################################################
+#                   GNU General Public License v3.0                     #
+#########################################################################
+---
+- name: Stop '{{ qbittorrent_name }}.service'
+  ansible.builtin.systemd:
+    name: "{{ qbittorrent_name }}.service"
+    state: stopped
+
+- name: Remove '{{ qbittorrent_name }}.service' file
+  ansible.builtin.file:
+    path: "/etc/systemd/system/{{ qbittorrent_name }}.service"
+    state: absent

roles/qbittorrent/tasks/subtasks/post-install/main.yml

@@ -20,9 +20,9 @@
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/stop_docker_container.yml"
   when: not qbittorrent_host_install
 
-- name: Post-Install | Stop '{{ qbittorrent_name }}.service'
+- name: Post-Install | Stop '{{ qbittorent_service_name }}'
   ansible.builtin.systemd:
-    name: "{{ qbittorrent_name }}.service"
+    name: "{{ qbittorent_service_name }}"
     state: stopped
     enabled: true
   when: qbittorrent_host_install
@@ -34,9 +34,9 @@
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/start_docker_container.yml"
   when: not qbittorrent_host_install
 
-- name: Post-Install | Start '{{ qbittorrent_name }}.service'
+- name: Post-Install | Start '{{ qbittorent_service_name }}'
   ansible.builtin.systemd:
-    name: "{{ qbittorrent_name }}.service"
+    name: "{{ qbittorent_service_name }}"
     state: started
     enabled: true
   when: qbittorrent_host_install