From 9b09e5711bc05c005859f60ece1db38cd7596057 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Tue, 5 Jan 2021 19:40:52 +0100
Subject: [PATCH] Solved multiple bugs

---
 roles/native-pull-remote-backups/Readme.md                 | 7 +++++++
 .../templates/pull-remote-backups.service                  | 2 +-
 .../templates/pull-remote-backups.sh                       | 4 +++-
 roles/native-systemd-email/handlers/main.yml               | 4 ++++
 roles/native-systemd-email/tasks/main.yml                  | 3 ++-
 ...{systemd-email.service.j2 => systemd-email@.service.j2} | 4 ++--
 6 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 roles/native-systemd-email/handlers/main.yml
 rename roles/native-systemd-email/templates/{systemd-email.service.j2 => systemd-email@.service.j2} (58%)

diff --git a/roles/native-pull-remote-backups/Readme.md b/roles/native-pull-remote-backups/Readme.md
index 6db8cf02..3a35d84a 100644
--- a/roles/native-pull-remote-backups/Readme.md
+++ b/roles/native-pull-remote-backups/Readme.md
@@ -1,7 +1,14 @@
 # role native-pull-remote-backups
 
+## debug
+### live
 To track what the service is doing execute the following command:
 
 ```bash
   watch -n2 "systemctl status pull-remote-backups.service"
 ```
+
+### history
+```bash
+  sudo journalctl -u pull-remote-backups
+```
diff --git a/roles/native-pull-remote-backups/templates/pull-remote-backups.service b/roles/native-pull-remote-backups/templates/pull-remote-backups.service
index 19a96c10..7189b160 100644
--- a/roles/native-pull-remote-backups/templates/pull-remote-backups.service
+++ b/roles/native-pull-remote-backups/templates/pull-remote-backups.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=pull remote backups
+OnFailure=systemd-email@%n.service
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/bash /usr/local/bin/pull-remote-backups.sh
-OnFailure=systemd-email@%n.service
diff --git a/roles/native-pull-remote-backups/templates/pull-remote-backups.sh b/roles/native-pull-remote-backups/templates/pull-remote-backups.sh
index d425716f..39e6e369 100644
--- a/roles/native-pull-remote-backups/templates/pull-remote-backups.sh
+++ b/roles/native-pull-remote-backups/templates/pull-remote-backups.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 hosts="{{pull_remote_backups_hosts}}";
+errors=0
 for host in $hosts; do
-        bash /usr/local/bin/pull-remote-backup/pull-remote-backup.sh $host;
+        bash /usr/local/bin/pull-remote-backup/pull-remote-backup.sh $host || ((errors+=1));
 done;
+exit $errors;
diff --git a/roles/native-systemd-email/handlers/main.yml b/roles/native-systemd-email/handlers/main.yml
new file mode 100644
index 00000000..0b8ff530
--- /dev/null
+++ b/roles/native-systemd-email/handlers/main.yml
@@ -0,0 +1,4 @@
+- name: "restart systemd-email service"
+  systemd:
+    name: systemd-email.service
+    daemon_reload: yes
diff --git a/roles/native-systemd-email/tasks/main.yml b/roles/native-systemd-email/tasks/main.yml
index 41fdc426..35207f88 100644
--- a/roles/native-systemd-email/tasks/main.yml
+++ b/roles/native-systemd-email/tasks/main.yml
@@ -8,4 +8,5 @@
   template: src=systemd-email.sh.j2 dest=/usr/local/bin/systemd-email.sh
 
 - name: configure systemd-email.service
-  template: src=systemd-email.service.j2 dest=/etc/systemd/system/systemd-email.service
+  template: src=systemd-email@.service.j2 dest=/etc/systemd/system/systemd-email@.service
+  notify: restart systemd-email service
diff --git a/roles/native-systemd-email/templates/systemd-email.service.j2 b/roles/native-systemd-email/templates/systemd-email@.service.j2
similarity index 58%
rename from roles/native-systemd-email/templates/systemd-email.service.j2
rename to roles/native-systemd-email/templates/systemd-email@.service.j2
index 66c5c4a6..2a58bd2b 100644
--- a/roles/native-systemd-email/templates/systemd-email.service.j2
+++ b/roles/native-systemd-email/templates/systemd-email@.service.j2
@@ -3,6 +3,6 @@ Description=status email for %i to user
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/bin/systemd-email.sh %i
-User=nobody
+ExecStart=/bin/bash /usr/local/bin/systemd-email.sh %i
+User=root
 Group=systemd-journal