From 1f84cb75389788d2efeaee48c238076010547be5 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Sun, 10 Apr 2022 17:22:57 +0200
Subject: [PATCH] chore: adjust systemd attribute order

---
 defaults/main.yml                                    | 1 -
 templates/systemd/user/freshrss-container.service.j2 | 7 +++----
 templates/systemd/user/freshrss-pod.service.j2       | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index ec61b91..77ccd3c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,7 +9,6 @@ freshrss_base_url: "http://localhost/"
 freshrss_user: "freshrss"
 freshrss_user_home: "/home/{{ freshrss_user }}"
 
-freshrss_container_name: freshrss
 freshrss_restart_policy: always
 freshrss_service_stopped: False
 
diff --git a/templates/systemd/user/freshrss-container.service.j2 b/templates/systemd/user/freshrss-container.service.j2
index 6dc5ec2..0180314 100644
--- a/templates/systemd/user/freshrss-container.service.j2
+++ b/templates/systemd/user/freshrss-container.service.j2
@@ -11,6 +11,9 @@ BindsTo={{ __freshrss_pod_name }}.service
 After={{ __freshrss_pod_name }}.service
 
 [Service]
+Type=notify
+NotifyAccess=all
+KillMode=control-group
 Environment=PODMAN_SYSTEMD_UNIT=%N
 SyslogIdentifier=%N
 LogExtraFields=CONTAINER_NAME=%N
@@ -56,9 +59,5 @@ ExecStart=/usr/bin/podman start {{ __freshrss_container_name }}
 ExecStop=/usr/bin/podman stop --ignore -t 10 {{ __freshrss_container_name }}
 ExecStopPost=/usr/bin/podman rm --force --ignore {{ __freshrss_container_name }}
 
-Type=notify
-NotifyAccess=all
-KillMode=control-group
-
 [Install]
 WantedBy=multi-user.target default.target
diff --git a/templates/systemd/user/freshrss-pod.service.j2 b/templates/systemd/user/freshrss-pod.service.j2
index 9621d08..516c252 100644
--- a/templates/systemd/user/freshrss-pod.service.j2
+++ b/templates/systemd/user/freshrss-pod.service.j2
@@ -10,10 +10,11 @@ Requires= dbus.socket {{ __freshrss_container_name }}.service
 Before={{ __freshrss_container_name }}.service
 
 [Service]
+Type=forking
+KillMode=control-group
 Environment=PODMAN_SYSTEMD_UNIT=%N
 SyslogIdentifier=%N
 LogExtraFields=CONTAINER_NAME=%N
-
 Delegate=memory pids
 
 Restart=always
@@ -30,8 +31,5 @@ ExecStartPre=/usr/bin/podman pod create \
 ExecStart=/usr/bin/podman pod start {{ __freshrss_pod_name }}
 ExecStop=/usr/bin/podman pod stop --ignore -t 10 {{ __freshrss_pod_name }}
 
-Type=forking
-KillMode=control-group
-
 [Install]
 WantedBy=multi-user.target default.target