From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 1 Jul 2019 15:32:53 +0000 (+0200)
Subject: systemd: add kres-cache-gc.service
X-Git-Tag: v4.1.0^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=086f8ac2ebdd0dccd253f67a2a2165572393bb60;p=thirdparty%2Fknot-resolver.git

systemd: add kres-cache-gc.service
---

diff --git a/distro/deb/knot-resolver.install b/distro/deb/knot-resolver.install
index 5e11209cf..a47a3e09c 100644
--- a/distro/deb/knot-resolver.install
+++ b/distro/deb/knot-resolver.install
@@ -1,5 +1,6 @@
 etc/knot-resolver/kresd.conf
 usr/lib/systemd/system/kresd@.service lib/systemd/system/
+usr/lib/systemd/system/kres-cache-gc.service lib/systemd/system/
 usr/lib/systemd/system/kresd.target lib/systemd/system/
 usr/lib/systemd/system/kresd.socket lib/systemd/system/
 usr/lib/systemd/system/kresd-tls.socket lib/systemd/system/
diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 428278cbf..6c3b9504c 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -214,7 +214,7 @@ systemctl daemon-reload
 %endif
 
 %preun
-%systemd_preun 'kresd@*.service' kresd.target kresd.socket kresd-tls.socket
+%systemd_preun 'kresd@*.service' kres-cache-gc.service kresd.target kresd.socket kresd-tls.socket
 
 %postun
 # NOTE: this doesn't restart the services on CentOS 7
@@ -237,6 +237,7 @@ systemctl daemon-reload
 %attr(644,root,knot-resolver) %config(noreplace) %{_sysconfdir}/knot-resolver/root.hints
 %attr(644,root,knot-resolver) %config(noreplace) %{_sysconfdir}/knot-resolver/icann-ca.pem
 %{_unitdir}/kresd@.service
+%{_unitdir}/kres-cache-gc.service
 %{_unitdir}/kresd.target
 %dir %{_unitdir}/multi-user.target.wants
 %{_unitdir}/multi-user.target.wants/kresd.target
diff --git a/systemd/kres-cache-gc.service.in b/systemd/kres-cache-gc.service.in
new file mode 100644
index 000000000..12b1ec82e
--- /dev/null
+++ b/systemd/kres-cache-gc.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=Knot Resolver Garbage Collector daemon
+Documentation=man:kresd.systemd(7)
+Documentation=man:kresd(8)
+
+[Service]
+Type=simple
+ExecStart=@sbin_dir@/kres-cache-gc -c @systemd_work_dir@ -d 1000
+User=knot-resolver
+Restart=on-abnormal
+Slice=system-kresd.slice
+
+[Install]
+WantedBy=kresd.target
diff --git a/systemd/kresd@.service.in b/systemd/kresd@.service.in
index e94f23376..96b821cf0 100644
--- a/systemd/kresd@.service.in
+++ b/systemd/kresd@.service.in
@@ -2,6 +2,8 @@
 Description=Knot Resolver daemon
 Documentation=man:kresd.systemd(7)
 Documentation=man:kresd(8)
+Wants=kres-cache-gc.service
+Before=kres-cache-gc.service
 
 [Service]
 Type=notify
diff --git a/systemd/meson.build b/systemd/meson.build
index 662a3ec29..ac8965429 100644
--- a/systemd/meson.build
+++ b/systemd/meson.build
@@ -30,6 +30,12 @@ if systemd_files == 'enabled'
     configuration: systemd_config,
     install_dir: systemd_unit_dir,
   )
+  kres_cache_gc_service = configure_file(
+    input: 'kres-cache-gc.service.in',
+    output: 'kres-cache-gc.service',
+    configuration: systemd_config,
+    install_dir: systemd_unit_dir,
+  )
   install_data(
     sources: [
       'kresd.socket',
diff --git a/systemd/nosocket/kres-cache-gc.service.in b/systemd/nosocket/kres-cache-gc.service.in
new file mode 100644
index 000000000..29a0cfede
--- /dev/null
+++ b/systemd/nosocket/kres-cache-gc.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=Knot Resolver Garbage Collector daemon
+Documentation=man:kresd.systemd.nosocket(7)
+Documentation=man:kresd(8)
+
+[Service]
+Type=simple
+ExecStart=@sbin_dir@/kres-cache-gc -c @systemd_work_dir@ -d 1000
+User=knot-resolver
+Restart=on-abnormal
+Slice=system-kresd.slice
+
+[Install]
+WantedBy=kresd.target
diff --git a/systemd/nosocket/kresd@.service.in b/systemd/nosocket/kresd@.service.in
index dd7f16a42..7c3b6106c 100644
--- a/systemd/nosocket/kresd@.service.in
+++ b/systemd/nosocket/kresd@.service.in
@@ -2,6 +2,8 @@
 Description=Knot Resolver daemon
 Documentation=man:kresd.systemd.nosocket(7)
 Documentation=man:kresd(8)
+Wants=kres-cache-gc.service
+Before=kres-cache-gc.service
 
 [Service]
 Type=notify
diff --git a/systemd/nosocket/meson.build b/systemd/nosocket/meson.build
index 383b912e0..5fe43799b 100644
--- a/systemd/nosocket/meson.build
+++ b/systemd/nosocket/meson.build
@@ -7,6 +7,12 @@ kresd_service = configure_file(
   configuration: systemd_config,
   install_dir: systemd_unit_dir,
 )
+kres_cache_gc_service = configure_file(
+  input: 'kres-cache-gc.service.in',
+  output: 'kres-cache-gc.service',
+  configuration: systemd_config,
+  install_dir: systemd_unit_dir,
+)
 
 install_data(
   sources: 'kresd.target',