From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 27 Nov 2019 11:46:06 +0000 (+0100)
Subject: systemd: add proper User/Group
X-Git-Tag: v4.3.0~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=490d230fdc25614a78642e7cc90bd02939714736;p=thirdparty%2Fknot-resolver.git

systemd: add proper User/Group

The Group= settings was ommited and default group of User= was
implicitly used. Now the group set at build time is respected.

GC didn't respect the user/group set at build time at all.
---

diff --git a/systemd/kres-cache-gc.service.in b/systemd/kres-cache-gc.service.in
index b48d65fd4..f7522c8b2 100644
--- a/systemd/kres-cache-gc.service.in
+++ b/systemd/kres-cache-gc.service.in
@@ -6,7 +6,8 @@ Documentation=man:kresd(8)
 [Service]
 Type=simple
 ExecStart=@sbin_dir@/kres-cache-gc -c @systemd_work_dir@ -d 1000
-User=knot-resolver
+User=@user@
+Group=@group@
 Restart=on-failure
 RestartSec=30
 StartLimitInterval=400
diff --git a/systemd/kresd@.service.in b/systemd/kresd@.service.in
index 6454cc2d1..ede5cc08d 100644
--- a/systemd/kresd@.service.in
+++ b/systemd/kresd@.service.in
@@ -12,6 +12,7 @@ Type=notify
 WorkingDirectory=@systemd_work_dir@
 ExecStart=@sbin_dir@/kresd --config=@etc_dir@/kresd.conf
 User=@user@
+Group=@group@
 TimeoutStopSec=10s
 WatchdogSec=10s
 Restart=on-abnormal
diff --git a/systemd/nosocket/kres-cache-gc.service.in b/systemd/nosocket/kres-cache-gc.service.in
index 624de86f4..38da02290 100644
--- a/systemd/nosocket/kres-cache-gc.service.in
+++ b/systemd/nosocket/kres-cache-gc.service.in
@@ -6,7 +6,8 @@ Documentation=man:kresd(8)
 [Service]
 Type=simple
 ExecStart=@sbin_dir@/kres-cache-gc -c @systemd_work_dir@ -d 1000
-User=knot-resolver
+User=@user@
+Group=@group@
 Restart=on-failure
 RestartSec=30
 StartLimitInterval=400