diff --git a/vars/timers.yml b/defaults/main.yml similarity index 98% rename from vars/timers.yml rename to defaults/main.yml index f694cbebb3089ba0f158ef1f10afebb1c3f604e0..e2bb6542fe94a1f10e2e0b001d0f0d9ba640f858 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 ede6ea2f4fcca3eb6f9d0a8f37fa4014280e9f51..be685a22bb4c8037616876809f2e09aa996a4a7d 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