From b1ff2515e14d65b19a54d5bbcd60eafc9e1c1f99 Mon Sep 17 00:00:00 2001
From: Thomas Kleinendorst <thomas@kleinendorst.info>
Date: Tue, 23 Apr 2024 17:12:06 +0200
Subject: [PATCH] Start podman restart service in user role

---
 roles/actual/tasks/main.yml       | 9 +--------
 roles/pi-hole/tasks/main.yml      | 9 +--------
 roles/user/tasks/main.yml         | 9 +++++++++
 roles/user/vars/main/defaults.yml | 2 ++
 4 files changed, 13 insertions(+), 16 deletions(-)
 create mode 100644 roles/user/vars/main/defaults.yml

diff --git a/roles/actual/tasks/main.yml b/roles/actual/tasks/main.yml
index 2e81d6d..59fcb8c 100644
--- a/roles/actual/tasks/main.yml
+++ b/roles/actual/tasks/main.yml
@@ -5,6 +5,7 @@
   vars:
     user_username: "{{ actual_username }}"
     user_password: "{{ actual_password }}"
+    user_use_podman_restart: true
 - name: Create a directory for holding actual's (volume) data
   become: true
   become_user: "{{ actual_username }}"
@@ -12,14 +13,6 @@
     path: "/home/{{ actual_username }}/actual_data"
     state: directory
     mode: '0700'
-- name: Start the podman-restart.service
-  become: true
-  become_user: "{{ actual_username }}"
-  ansible.builtin.systemd:
-    name: podman-restart.service
-    state: started
-    enabled: true
-    scope: user
 - name: Gather facts on the actual container
   become: true
   become_user: "{{ actual_username }}"
diff --git a/roles/pi-hole/tasks/main.yml b/roles/pi-hole/tasks/main.yml
index d6ec266..8208825 100644
--- a/roles/pi-hole/tasks/main.yml
+++ b/roles/pi-hole/tasks/main.yml
@@ -5,6 +5,7 @@
   vars:
     user_username: "{{ pi_hole_username }}"
     user_password: "{{ pi_hole_password }}"
+    user_use_podman_restart: true
 - name: Create the /etc-pihole directory in the home directory (will be mounted to the container)
   become: true
   become_user: "{{ pi_hole_username }}"
@@ -34,14 +35,6 @@
     # changes the user of the folder to a UID only known within the container. This command basically doesn't need to
     # change anything at this point so we'll ignore the error for now.
     - "'set_mode_if_different' not in command_result.module_stdout"
-- name: Start the podman-restart.service
-  become: true
-  become_user: "{{ pi_hole_username }}"
-  ansible.builtin.systemd:
-    name: podman-restart.service
-    state: started
-    enabled: true
-    scope: user
 - name: Gather facts on the pi-hole container
   become: true
   become_user: "{{ pi_hole_username }}"
diff --git a/roles/user/tasks/main.yml b/roles/user/tasks/main.yml
index ffcbb70..a441c84 100644
--- a/roles/user/tasks/main.yml
+++ b/roles/user/tasks/main.yml
@@ -115,3 +115,12 @@
   ansible.builtin.user:
     name: "{{ target_user }}"
     shell: /usr/bin/zsh
+- name: Start the podman-restart.service
+  become: true
+  become_user: "{{ target_user }}"
+  ansible.builtin.systemd:
+    name: podman-restart.service
+    state: started
+    enabled: true
+    scope: user
+  when: user_use_podman_restart
diff --git a/roles/user/vars/main/defaults.yml b/roles/user/vars/main/defaults.yml
new file mode 100644
index 0000000..b061d78
--- /dev/null
+++ b/roles/user/vars/main/defaults.yml
@@ -0,0 +1,2 @@
+---
+user_use_podman_restart: false