From 3150cfe5bfd7ca7db0a733832a708a57f1ae36ab Mon Sep 17 00:00:00 2001
From: Jessica Hofmann <jessica.hofmann@slub-dresden.de>
Date: Tue, 18 Jul 2023 10:50:46 +0200
Subject: [PATCH] bugfix vars file
---
vars/timers.yml => defaults/main.yml | 2 +-
tasks/main.yml | 65 ++++++++++++----------------
2 files changed, 28 insertions(+), 39 deletions(-)
rename vars/timers.yml => defaults/main.yml (98%)
diff --git a/vars/timers.yml b/defaults/main.yml
similarity index 98%
rename from vars/timers.yml
rename to defaults/main.yml
index f694cbe..e2bb654 100644
--- a/vars/timers.yml
+++ b/defaults/main.yml
@@ -13,4 +13,4 @@ timers:
timer_OnActiveSec: # relative time after the timer unit was last activated
timer_OnBootSec: # Relative time after the computer was booted
timer_OnStartupSec: # Relative time after systemd was started
- timer_OnUnitActiveSec: # Relative time after the service unit was last activated
+ timer_OnUnitActiveSec: # Relative time after the service unit was last activated
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index ede6ea2..be685a2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,41 +1,30 @@
---
----
-- block:
-
- - name: Failing when timer_command is undefined
- fail:
- msg: Varible timer_command is not defined
- when: item.value.timer_command is undefined
- with_dict: "{{ timers }}"
-
- - name: Uploading service file
- template:
- src: service.j2
- dest: "{{ systemd_base_path | default('/etc/systemd/system') }}/{{ item.key }}.service"
- owner: "{{ item.value.timer_user | default('root') }}"
- group: "{{ item.value.timer_user | default('root') }}"
- mode: 0644
- with_dict: "{{ timers }}"
- notify: Reload systemd
-
- - name: Uploading timer file
- template:
- src: timer.j2
- dest: "{{ systemd_base_path | default('/etc/systemd/system') }}/{{ item.key }}.timer"
- owner: "{{ item.value.timer_user | default('root') }}"
- group: "{{ item.value.timer_user | default('root') }}"
- mode: 0644
- with_dict: "{{ timers }}"
- notify: Reload systemd
+ - name: Uploading service file
+ template:
+ src: service.j2
+ dest: "{{ systemd_base_path | default('/etc/systemd/system') }}/{{ item.key }}.service"
+ owner: "{{ item.value.timer_user | default('root') }}"
+ group: "{{ item.value.timer_user | default('root') }}"
+ mode: 0644
+ with_dict: "{{ timers }}"
+ notify: Reload systemd
- - name: Enabling timers
- systemd:
- name: "{{ item.key }}.timer"
- state: restarted
- enabled: true
- masked: false
- daemon_reload: true
- scope: "{{ systemd_scope | default('system') }}"
- with_dict: "{{ timers }}"
+ - name: Uploading timer file
+ template:
+ src: timer.j2
+ dest: "{{ systemd_base_path | default('/etc/systemd/system') }}/{{ item.key }}.timer"
+ owner: "{{ item.value.timer_user | default('root') }}"
+ group: "{{ item.value.timer_user | default('root') }}"
+ mode: 0644
+ with_dict: "{{ timers }}"
+ notify: Reload systemd
- when: timers is defined
\ No newline at end of file
+ - name: Enabling timers
+ systemd:
+ name: "{{ item.key }}.timer"
+ state: restarted
+ enabled: true
+ masked: false
+ daemon_reload: true
+ scope: "{{ systemd_scope | default('system') }}"
+ with_dict: "{{ timers }}"
\ No newline at end of file
--
GitLab