Ensure services always run

journal-remote/files/restart.conf

+[Service]
+Restart=always

journal-remote/tasks/main.yml

@@ -31,6 +31,17 @@
     - journal-remote
     - config
 
+- name: Ensure systemd-journal-remote always runs
+  copy:
+    dest: /etc/systemd/system/systemd-journal-remote.service.d/restart.conf
+    src: restart.conf
+  notify:
+    - Reload systemd
+    - Restart systemd-journal-remote
+  tags:
+    - journal-remote
+    - config
+
 - name: Ensure journal-remote directory is present
   file:
     path: /var/log/journal/remote

journal-upload/files/restart.conf

+[Service]
+Restart=always

journal-upload/handlers/main.yml

+- name: Reload systemd
+  systemd: daemon-reload=yes
+
 - name: Restart systemd-journal-upload
   systemd: name=systemd-journal-upload state=restarted

journal-upload/tasks/main.yml

@@ -19,6 +19,25 @@
         - journal-upload
         - config
 
+    - name: Ensure presence of unit drop-in config directory
+      file:
+        path: /etc/systemd/system/systemd-journal-upload.service.d
+        state: directory
+      tags:
+        - journal-upload
+        - config
+
+    - name: Ensure systemd-journal-upload always runs
+      copy:
+        dest: /etc/systemd/system/systemd-journal-upload.service.d/restart.conf
+        src: restart.conf
+      notify:
+        - Reload systemd
+        - Restart systemd-journal-upload
+      tags:
+        - journal-upload
+        - config
+
     - name: Enable journal-upload service
       systemd:
         name: systemd-journal-upload.service