From 24d69ee598ff72c212e2d9a65ee6c0fc7f2533e6 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Sat, 16 Jan 2021 18:40:58 +0100
Subject: [PATCH] Move handler to tasks

Disabling reflector as handler afterwards removes the changes done earlier
---
 roles/arch/handlers/main.yml               | 8 --------
 roles/arch/tasks/main.yml                  | 9 ++++++++-
 roles/arch/tasks/timer.yml                 | 3 +--
 roles/arch/templates/timer/daily_target.j2 | 1 +
 roles/arch/templates/timer/daily_timer.j2  | 1 +
 roles/arch/templates/timer/weekly_timer.j2 | 1 +
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/roles/arch/handlers/main.yml b/roles/arch/handlers/main.yml
index 581b47c..6ae7096 100644
--- a/roles/arch/handlers/main.yml
+++ b/roles/arch/handlers/main.yml
@@ -14,14 +14,6 @@
     enabled: true
     daemon-reload: true
 
-# started by weekly timer
-- name: disable reflector
-  become: true
-  systemd:
-    name: reflector
-    state: stopped
-    enabled: false
-
 - name: restart user ssh-agent
   systemd:
     name: ssh-agent
diff --git a/roles/arch/tasks/main.yml b/roles/arch/tasks/main.yml
index d15960d..6696623 100644
--- a/roles/arch/tasks/main.yml
+++ b/roles/arch/tasks/main.yml
@@ -22,7 +22,14 @@
     owner: root
     group: root
     mode: "0600"
-  notify: disable reflector
+
+# started by weekly timer
+- name: disable reflector
+  become: true
+  systemd:
+    name: reflector
+    state: stopped
+    enabled: false
 
 - name: copy pacman configuration
   become: yes
diff --git a/roles/arch/tasks/timer.yml b/roles/arch/tasks/timer.yml
index 3e167e0..f436939 100644
--- a/roles/arch/tasks/timer.yml
+++ b/roles/arch/tasks/timer.yml
@@ -50,6 +50,5 @@
   become: yes
   file:
     src: "/usr/lib/systemd/system/reflector.service"
-    path: "/etc/systemd/system/weekly.target.wants/reflector.service"
+    dest: "/etc/systemd/system/weekly.target.wants/reflector.service"
     state: link
-
diff --git a/roles/arch/templates/timer/daily_target.j2 b/roles/arch/templates/timer/daily_target.j2
index bf93acb..bf4d594 100644
--- a/roles/arch/templates/timer/daily_target.j2
+++ b/roles/arch/templates/timer/daily_target.j2
@@ -4,6 +4,7 @@
 # Wants=daily.target
 #
 # Or symlink the unit file to the daily.target.wants directory manually
+
 [Unit]
 Description=Daily timer target
 Requires=multi-user.target
diff --git a/roles/arch/templates/timer/daily_timer.j2 b/roles/arch/templates/timer/daily_timer.j2
index 4b4eace..cdc47f0 100644
--- a/roles/arch/templates/timer/daily_timer.j2
+++ b/roles/arch/templates/timer/daily_timer.j2
@@ -1,5 +1,6 @@
 # {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 #
+
 [Unit]
 Description=Timer which runs all services on a daily basis inside the daily.target.wants directory
 
diff --git a/roles/arch/templates/timer/weekly_timer.j2 b/roles/arch/templates/timer/weekly_timer.j2
index 56989bd..e4c33f4 100644
--- a/roles/arch/templates/timer/weekly_timer.j2
+++ b/roles/arch/templates/timer/weekly_timer.j2
@@ -1,5 +1,6 @@
 # {{ ansible_managed }} {{ ansible_date_time.time }} {{ ansible_date_time.date }}
 #
+
 [Unit]
 Description=Timer which runs all services on a weekly basis inside the weekly.target.wants directory