various: use systemd resource task to allow reenable functionality to be used

saltydk · saltydk · commit a5a80717fe11 · 2026-02-15T15:38:57.000+01:00
diff --git a/resources/tasks/systemd/manage_service.yml b/resources/tasks/systemd/manage_service.yml
@@ -0,0 +1,27 @@
+###############################################################################
+# Title:         Saltbox: Resources | Tasks | systemd | Manage Service        #
+# Author(s):     salty                                                        #
+# URL:           https://github.com/saltyorg/Saltbox                          #
+# --                                                                          #
+###############################################################################
+#                   GNU General Public License v3.0                           #
+###############################################################################
+---
+- name: Resources | Tasks | systemd | Manage Service | manage '{{ _service_name }}'
+  ansible.builtin.systemd_service:
+    name: "{{ _service_name }}"
+    state: "{{ _service_state | default(omit) }}"
+    enabled: "{{ _service_enabled | default(omit) }}"
+    daemon_reload: "{{ _service_daemon_reload | default(omit) }}"
+    daemon_reexec: "{{ _service_daemon_reexec | default(omit) }}"
+    masked: "{{ _service_masked | default(omit) }}"
+    no_block: "{{ _service_no_block | default(omit) }}"
+    force: "{{ _service_force | default(omit) }}"
+    scope: "{{ _service_scope | default(omit) }}"
+
+- name: Resources | Tasks | systemd | Manage Service | reenable '{{ _service_name }}'
+  ansible.builtin.command: "systemctl reenable {{ _service_name }}"
+  when:
+    - (_service_reenable | default(false) | bool)
+    - (_service_enabled | default(false) | bool)
+  changed_when: false
diff --git a/roles/autoplow/tasks/main.yml b/roles/autoplow/tasks/main.yml
@@ -86,8 +86,10 @@
     force: true
 
 - name: Start service
-  ansible.builtin.systemd_service:
-    name: "{{ autoplow_service_name }}"
-    state: started
-    enabled: true
-    daemon_reload: true
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+  vars:
+    _service_name: "{{ autoplow_service_name }}"
+    _service_state: started
+    _service_enabled: true
+    _service_daemon_reload: true
+    _service_reenable: true
diff --git a/roles/cloudplow/tasks/main.yml b/roles/cloudplow/tasks/main.yml
@@ -115,11 +115,13 @@
         force: true
 
     - name: Start service
-      ansible.builtin.systemd_service:
-        name: "{{ cloudplow_service_name }}"
-        state: started
-        enabled: true
-        daemon_reload: true
+      ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+      vars:
+        _service_name: "{{ cloudplow_service_name }}"
+        _service_state: started
+        _service_enabled: true
+        _service_daemon_reload: true
+        _service_reenable: true
 
 - name: Cloudplow Skipped
   ansible.builtin.debug:
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
@@ -112,7 +112,6 @@ docker_service_sleep: "{{ 0
 docker_service_force: true
 docker_service_check: "{{ docker_binary.stat.exists and (docker_service_running or ((remote_docker_service_running is defined) and remote_docker_service_running) or ((unionfs_docker_service_running is defined) and unionfs_docker_service_running)) }}"
 docker_service_check_mounts: "{{ docker_binary.stat.exists and (((remote_docker_service_running is defined) and remote_docker_service_running) or ((unionfs_docker_service_running is defined) and unionfs_docker_service_running)) }}"
-docker_update_hosts_service_runtime_max: "3600s"
 docker_daemon_storage_driver: "{{ ('zfs' in var_lib_file_system.stdout) | ternary('zfs', 'overlay2') }}"
 docker_daemon_template_force: true
 
diff --git a/roles/docker/tasks/subtasks/controller.yml b/roles/docker/tasks/subtasks/controller.yml
@@ -49,11 +49,13 @@
     force: true
 
 - name: Controller | Enable 'saltbox_managed_docker_controller.service'
-  ansible.builtin.systemd_service:
-    name: saltbox_managed_docker_controller
-    enabled: true
-    state: restarted
-    daemon_reload: true
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+  vars:
+    _service_name: saltbox_managed_docker_controller
+    _service_enabled: true
+    _service_state: restarted
+    _service_daemon_reload: true
+    _service_reenable: true
 
 - name: Controller | Wait until Controller is ready
   ansible.builtin.uri:
@@ -79,11 +81,13 @@
     force: true
 
 - name: Controller | Enable 'saltbox_managed_docker_controller_helper.service'
-  ansible.builtin.systemd_service:
-    name: saltbox_managed_docker_controller_helper.service
-    enabled: true
-    state: restarted
-    daemon_reload: true
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+  vars:
+    _service_name: saltbox_managed_docker_controller_helper.service
+    _service_enabled: true
+    _service_state: restarted
+    _service_daemon_reload: true
+    _service_reenable: true
 
 - name: "Controller | Wait for 10 seconds before commencing"
   ansible.builtin.wait_for:
diff --git a/roles/docker/tasks/subtasks/dns.yml b/roles/docker/tasks/subtasks/dns.yml
@@ -63,8 +63,10 @@
     force: true
 
 - name: "DNS | Start 'saltbox_managed_docker_update_hosts.service'"
-  ansible.builtin.systemd_service:
-    name: saltbox_managed_docker_update_hosts
-    state: restarted
-    enabled: true
-    daemon_reload: true
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+  vars:
+    _service_name: saltbox_managed_docker_update_hosts
+    _service_state: restarted
+    _service_enabled: true
+    _service_daemon_reload: true
+    _service_reenable: true
diff --git a/roles/docker/templates/docker-controller-helper.service.j2 b/roles/docker/templates/docker-controller-helper.service.j2
@@ -18,4 +18,4 @@ After=docker.service saltbox_managed_docker_controller.service
 ExecStart={{ docker_controller_binary_path }} helper --controller-url "http://127.0.0.1:3377"
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=docker.service saltbox_managed_docker_controller.service
diff --git a/roles/docker/templates/docker-controller.service.j2 b/roles/docker/templates/docker-controller.service.j2
@@ -10,7 +10,6 @@
 
 [Unit]
 Description=Saltbox Docker Controller
-After=docker.service
 
 [Service]
 Type=simple
diff --git a/roles/docker/templates/docker-update-hosts.service.j2 b/roles/docker/templates/docker-update-hosts.service.j2
@@ -11,7 +11,7 @@
 [Unit]
 Description=Saltbox Docker Hosts Manager
 After=docker.service
-Requires=docker.service
+BindsTo=docker.service
 
 [Service]
 Type=simple
@@ -20,4 +20,4 @@ Restart=always
 RestartSec=10
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=docker.service
diff --git a/roles/docker/templates/override.conf.j2 b/roles/docker/templates/override.conf.j2
@@ -10,7 +10,6 @@
 
 [Unit]
 After={{ docker_service_after }}
-Wants=saltbox_managed_docker_controller_helper.service saltbox_managed_docker_update_hosts.service
 
 [Service]
 ExecStartPre=modprobe -va bridge br_netfilter
diff --git a/roles/node_exporter/tasks/main.yml b/roles/node_exporter/tasks/main.yml
@@ -78,10 +78,12 @@
     daemon_reload: true
 
 - name: Systemd start 'node_exporter.service'
-  ansible.builtin.systemd_service:
-    name: node_exporter.service
-    state: started
-    enabled: true
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+  vars:
+    _service_name: node_exporter.service
+    _service_state: started
+    _service_enabled: true
+    _service_reenable: true
 
 - name: "Cleanup tmp folder"
   ansible.builtin.file:
diff --git a/roles/qbittorrent/tasks/main2.yml b/roles/qbittorrent/tasks/main2.yml
@@ -101,10 +101,12 @@
         daemon_reload: true
 
     - name: Start '{{ qbittorrent_role_service_name }}'
-      ansible.builtin.systemd_service:
-        name: "{{ qbittorrent_role_service_name }}"
-        state: started
-        enabled: true
+      ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+      vars:
+        _service_name: "{{ qbittorrent_role_service_name }}"
+        _service_state: started
+        _service_enabled: true
+        _service_reenable: true
 
 - name: Docker Install
   when: not lookup('role_var', '_host_install', role='qbittorrent')
diff --git a/roles/qbittorrent/tasks/subtasks/post-install/main.yml b/roles/qbittorrent/tasks/subtasks/post-install/main.yml
@@ -21,10 +21,11 @@
   when: not lookup('role_var', '_host_install', role='qbittorrent')
 
 - name: Post-Install | Stop '{{ lookup('role_var', '_service_name', role='qbittorrent') }}'
-  ansible.builtin.systemd_service:
-    name: "{{ lookup('role_var', '_service_name', role='qbittorrent') }}"
-    state: stopped
-    enabled: true
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+  vars:
+    _service_name: "{{ lookup('role_var', '_service_name', role='qbittorrent') }}"
+    _service_state: stopped
+    _service_enabled: true
   when: lookup('role_var', '_host_install', role='qbittorrent')
 
 - name: Post-Install | Settings Task
@@ -35,8 +36,9 @@
   when: not lookup('role_var', '_host_install', role='qbittorrent')
 
 - name: Post-Install | Start '{{ lookup('role_var', '_service_name', role='qbittorrent') }}'
-  ansible.builtin.systemd_service:
-    name: "{{ lookup('role_var', '_service_name', role='qbittorrent') }}"
-    state: started
-    enabled: true
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+  vars:
+    _service_name: "{{ lookup('role_var', '_service_name', role='qbittorrent') }}"
+    _service_state: started
+    _service_enabled: true
   when: lookup('role_var', '_host_install', role='qbittorrent')
diff --git a/roles/remote/tasks/remote.yml b/roles/remote/tasks/remote.yml
@@ -161,28 +161,34 @@
       when: rclone_remote_is_working
       block:
         - name: Remote | Start '{{ _service_file }}'
-          ansible.builtin.systemd_service:
-            name: "{{ _service_file }}"
-            state: started
-            enabled: true
+          ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+          vars:
+            _service_name: "{{ _service_file }}"
+            _service_state: started
+            _service_enabled: true
+            _service_reenable: true
 
         - name: Remote | "Wait for 5 seconds"
           ansible.builtin.wait_for:
             timeout: 5
 
         - name: Remote | Start '{{ _service_refresh }}.timer'
-          ansible.builtin.systemd_service:
-            name: "{{ _service_refresh }}.timer"
-            state: started
-            enabled: true
+          ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+          vars:
+            _service_name: "{{ _service_refresh }}.timer"
+            _service_state: started
+            _service_enabled: true
+            _service_reenable: true
           when: (item.settings.enable_refresh is defined) and (item.settings.enable_refresh | bool)
 
         - name: Remote | Start '{{ _service_refresh }}.service'
-          ansible.builtin.systemd_service:
-            name: "{{ _service_refresh }}.service"
-            state: started
-            enabled: true
-            no_block: true
+          ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+          vars:
+            _service_name: "{{ _service_refresh }}.service"
+            _service_state: started
+            _service_enabled: true
+            _service_no_block: true
+            _service_reenable: true
           when: (item.settings.enable_refresh is defined) and (item.settings.enable_refresh | bool)
 
     - name: "Remote | Display error message when Rclone remote is not working properly"
diff --git a/roles/unionfs/tasks/subtasks/mergerfs.yml b/roles/unionfs/tasks/subtasks/mergerfs.yml
@@ -71,7 +71,9 @@
   ansible.builtin.include_tasks: "mount_path.yml"
 
 - name: "MergerFS | Start '{{ mergerfs_service_name }}'"
-  ansible.builtin.systemd_service:
-    name: "{{ mergerfs_service_name }}"
-    state: started
-    enabled: true
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/systemd/manage_service.yml"
+  vars:
+    _service_name: "{{ mergerfs_service_name }}"
+    _service_state: started
+    _service_enabled: true
+    _service_reenable: true
