From 4c8fae0657be97dd844f5e6dc6a6e0f2db3e6d78 Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Sun, 14 Apr 2024 13:57:42 +0200
Subject: [PATCH] services: Merge some service templates

---
 roles/services/tasks/ircbot.yaml                | 17 ++++++++++++++---
 roles/services/tasks/power_mqtt.yaml            |  5 ++++-
 .../{irc-bot.service => generic.service}        |  7 +++++--
 roles/services/templates/irc-doorduino.service  | 16 ----------------
 roles/services/templates/irc-photos.service     | 16 ----------------
 roles/services/templates/power-mqtt.service     | 15 ---------------
 6 files changed, 23 insertions(+), 53 deletions(-)
 rename roles/services/templates/{irc-bot.service => generic.service} (57%)
 delete mode 100644 roles/services/templates/irc-doorduino.service
 delete mode 100644 roles/services/templates/irc-photos.service
 delete mode 100644 roles/services/templates/power-mqtt.service

diff --git a/roles/services/tasks/ircbot.yaml b/roles/services/tasks/ircbot.yaml
index ce9eeb0..d71c9d9 100644
--- a/roles/services/tasks/ircbot.yaml
+++ b/roles/services/tasks/ircbot.yaml
@@ -15,11 +15,14 @@
 
 - name: Install service file
   template:
-    src: irc-bot.service
+    src: generic.service
     dest: /etc/systemd/system/irc-bot.service
     owner: root
     group: root
     mode: 0644
+  vars:
+    description: Bitlair IRC bot
+    exec: /bin/bash /var/lib/irc-bot/irc-bot
   notify: restart irc-bot
 
 - name: Start irc-bot
@@ -45,11 +48,15 @@
 
 - name: Install photos notification service
   template:
-    src: irc-photos.service
+    src: generic.service
     dest: /etc/systemd/system/irc-photos.service
     owner: root
     group: root
     mode: 0644
+  vars:
+    description: Bitlair IRC photos notification
+    requires: irc-bot.service
+    exec: /bin/bash /var/lib/irc-helpers/photos.sh
   notify: restart irc-photos
 
 - name: Start irc-photos
@@ -70,11 +77,15 @@
 
 - name: Install doorduino notification service
   template:
-    src: irc-doorduino.service
+    src: generic.service
     dest: /etc/systemd/system/irc-doorduino.service
     owner: root
     group: root
     mode: 0644
+  vars:
+    description: Bitlair IRC doorduino notification
+    requires: irc-bot.service
+    exec: /bin/bash /var/lib/irc-helpers/doorduino.sh
   notify: restart irc-doorduino
 
 - name: Start irc-doorduino
diff --git a/roles/services/tasks/power_mqtt.yaml b/roles/services/tasks/power_mqtt.yaml
index b8a3357..afe42c3 100644
--- a/roles/services/tasks/power_mqtt.yaml
+++ b/roles/services/tasks/power_mqtt.yaml
@@ -14,11 +14,14 @@
 
 - name: Install power-mqtt service
   template:
-    src: power-mqtt.service
+    src: generic.service
     dest: /etc/systemd/system/power-mqtt.service
     owner: root
     group: root
     mode: 0644
+  vars:
+    description: SMD630 to MQTT Probe
+    exec: /var/lib/power-mqtt.py
   notify: restart power-mqtt
 
 - name: Start power-mqtt
diff --git a/roles/services/templates/irc-bot.service b/roles/services/templates/generic.service
similarity index 57%
rename from roles/services/templates/irc-bot.service
rename to roles/services/templates/generic.service
index 7d573a4..71d43e7 100644
--- a/roles/services/templates/irc-bot.service
+++ b/roles/services/templates/generic.service
@@ -1,12 +1,15 @@
 # Managed by Ansible
 
 [Unit]
-Description=Bitlair IRC bot
+Description={{ description }}
 After=network.target
+{% if requires|default('') %}
+Requires={{ requires }}
+{% endif %}
 
 [Service]
 Type=simple
-ExecStart=/bin/bash /var/lib/irc-bot/irc-bot
+ExecStart={{ exec }}
 Restart=always
 RestartSec=10s
 DynamicUser=true
diff --git a/roles/services/templates/irc-doorduino.service b/roles/services/templates/irc-doorduino.service
deleted file mode 100644
index a397600..0000000
--- a/roles/services/templates/irc-doorduino.service
+++ /dev/null
@@ -1,16 +0,0 @@
-# Managed by Ansible
-
-[Unit]
-Description=Bitlair IRC doorduino notification
-After=network.target
-Requires=irc-bot.service
-
-[Service]
-Type=simple
-ExecStart=/bin/bash /var/lib/irc-helpers/doorduino.sh
-Restart=always
-RestartSec=10s
-DynamicUser=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/services/templates/irc-photos.service b/roles/services/templates/irc-photos.service
deleted file mode 100644
index 2a69cac..0000000
--- a/roles/services/templates/irc-photos.service
+++ /dev/null
@@ -1,16 +0,0 @@
-# Managed by Ansible
-
-[Unit]
-Description=Bitlair IRC photos notification
-After=network.target
-Requires=irc-bot.service
-
-[Service]
-Type=simple
-ExecStart=/bin/bash /var/lib/irc-helpers/photos.sh
-Restart=always
-RestartSec=10s
-DynamicUser=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/services/templates/power-mqtt.service b/roles/services/templates/power-mqtt.service
deleted file mode 100644
index 82529a0..0000000
--- a/roles/services/templates/power-mqtt.service
+++ /dev/null
@@ -1,15 +0,0 @@
-# Managed by Ansible
-
-[Unit]
-Description=SMD630 to MQTT Probe
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/var/lib/power-mqtt.py
-Restart=on-failure
-RestartSec=10s
-DynamicUser=true
-
-[Install]
-WantedBy=multi-user.target