From 87681bb5f7435fd2b2fd28484fdd06e3355dd38f Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Mon, 12 Aug 2019 17:29:37 +0200
Subject: [PATCH] cleanup

---
 defaults/main.yml                              |  4 +++-
 tasks/prepare.yml                              |  2 +-
 templates/etc/systemd/system/matrix.service.j2 | 10 ++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 4ba7364..5d71ee2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,7 +9,7 @@ matrix_group: "{{ matrix_user }}"
 matrix_extra_groups: []
 
 # Ensure EPEL repo is available at this server
-matrix_dependencies:
+matrix_packages:
   - "@Development tools"
   - libtiff-devel
   - libjpeg-devel
@@ -58,6 +58,8 @@ matrix_logrotate_config:
       - delaycompress
       - "create 640 {{ matrix_user }} {{ matrix_group }}"
 
+matrix_restart_policy: "on-failure"
+
 matrix_server_url: example.com
 matrix_client_url: https://matrix.example.com
 
diff --git a/tasks/prepare.yml b/tasks/prepare.yml
index 9f0c093..08595cd 100644
--- a/tasks/prepare.yml
+++ b/tasks/prepare.yml
@@ -19,7 +19,7 @@
       package:
         name: "{{ item }}"
         state: present
-      loop: "{{ matrix_dependencies }}"
+      loop: "{{ matrix_packages }}"
   become: True
   become_user: root
 
diff --git a/templates/etc/systemd/system/matrix.service.j2 b/templates/etc/systemd/system/matrix.service.j2
index 20952d6..64a7eca 100644
--- a/templates/etc/systemd/system/matrix.service.j2
+++ b/templates/etc/systemd/system/matrix.service.j2
@@ -1,20 +1,18 @@
 #jinja2: lstrip_blocks: True
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 [Unit]
 Description=Synapse Matrix homeserver
 
 [Service]
 Type=simple
-Restart=on-abort
+Restart={{ matrix_restart_policy }}
 
 User={{ matrix_user }}
 Group={{ matrix_group }}
-
 WorkingDirectory={{ matrix_base_dir }}
-ExecStart={{ matrix_base_dir }}/env/bin/python -m synapse.app.homeserver --config-path={{ matrix_conf_dir }}/homeserver.yml
 
-# adjust the cache factor if necessary
-# Environment=SYNAPSE_CACHE_FACTOR=2.0
+ExecStart={{ matrix_base_dir }}/env/bin/python -m synapse.app.homeserver --config-path={{ matrix_conf_dir }}/homeserver.yml
+SyslogIdentifier=matrix-synapse
 
 [Install]
 WantedBy=multi-user.target