From 67a1b894f7f30cc866a2c8f8c2b0337de3402eef Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 15 Jan 2019 12:33:10 +0100
Subject: [PATCH] archwiki: Use loop instead of multiple tasks for systemd
units
Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
roles/archwiki/tasks/main.yml | 30 ++++++++----------------------
1 file changed, 8 insertions(+), 22 deletions(-)
diff --git a/roles/archwiki/tasks/main.yml b/roles/archwiki/tasks/main.yml
index bf3eda1f0..9a17f14b3 100644
--- a/roles/archwiki/tasks/main.yml
+++ b/roles/archwiki/tasks/main.yml
@@ -70,30 +70,16 @@
- name: start and enable systemd socket
service: name=php-fpm@{{ archwiki_user }}.socket state=started enabled=true
-- name: install runjobs service
- template: src="archwiki-runjobs.service.j2" dest="/etc/systemd/system/archwiki-runjobs.service" owner=root group=root mode=0644
- notify:
- - daemon reload
-
-- name: install runjobs timer
- template: src="archwiki-runjobs.timer.j2" dest="/etc/systemd/system/archwiki-runjobs.timer" owner=root group=root mode=0644
- notify:
- - daemon reload
-
-- name: install prune cache service
- template: src="archwiki-prune-cache.service.j2" dest="/etc/systemd/system/archwiki-prune-cache.service" owner=root group=root mode=0644
- notify:
- - daemon reload
-
-- name: install prune cache timer
- template: src="archwiki-prune-cache.timer.j2" dest="/etc/systemd/system/archwiki-prune-cache.timer" owner=root group=root mode=0644
- notify:
- - daemon reload
-
-- name: install runjobs wait service
- template: src="archwiki-runjobs-wait.service.j2" dest="/etc/systemd/system/archwiki-runjobs-wait.service" owner=root group=root mode=0644
+- name: install systemd services/timers
+ template: src="{{item}}.j2" dest="/etc/systemd/system/{{item}}" owner=root group=root mode=0644
notify:
- daemon reload
+ loop:
+ - archwiki-runjobs.service
+ - archwiki-runjobs-wait.service
+ - archwiki-runjobs.timer
+ - archwiki-prune-cache.service
+ - archwiki-prune-cache.timer
- name: start and enable archwiki runjobs timer
service: name="archwiki-runjobs.timer" enabled=yes state=started
--
GitLab