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 b48d65fd49258665aa8617c486fb94932f0413b4..f7522c8b2e544155c6fff287ff8c93cd3ada07b7 100644 (file)
--- 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 6454cc2d1eeb8abd1d90fd79474b5eb96461b6ff..ede5cc08dd8cb9278b5ce406ce97750548091dee 100644 (file)
--- 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 624de86f45167efce72a63ecaaaf21cd1dae26e5..38da02290705d99a6865ab5107526f34a7718384 100644 (file)
--- 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