Update systemd units to be named after daemon

diff --git a/systemd/knot-resolver-control.socket b/systemd/kresd-control.socket
similarity index 84%
rename from systemd/knot-resolver-control.socket
rename to systemd/kresd-control.socket
index 9f1976e8e77c2b3d59b9703e96af7d7454ad3e65..d830939e6193e6e6dfea2e20eb05c174561ece3a 100644 (file)
--- a/systemd/knot-resolver-control.socket
+++ b/systemd/kresd-control.socket
@@ -2,11 +2,12 @@
 Description=Knot DNS Resolver control socket
 Documentation=man:kresd(8)
 Before=sockets.target
+PartOf=kresd.socket
 
 [Socket]
 ListenStream=/run/knot-resolver/control
 FileDescriptorName=control
-Service=knot-resolver.service
+Service=kresd.service
 SocketMode=0660
 
 [Install]

diff --git a/systemd/knot-resolver-tls.socket b/systemd/kresd-tls.socket
similarity index 82%
rename from systemd/knot-resolver-tls.socket
rename to systemd/kresd-tls.socket
index 317dd2ebe01025430172beeadfa9a415fb873e7c..a06fe9eaefffc863695e4b2d478a31813f7fbece 100644 (file)
--- a/systemd/knot-resolver-tls.socket
+++ b/systemd/kresd-tls.socket
@@ -2,11 +2,12 @@
 Description=Knot DNS Resolver TLS network listener
 Documentation=man:kresd(8)
 Before=sockets.target
+PartOf=kresd.socket
 
 [Socket]
 ListenStream=853
 FileDescriptorName=tls
-Service=knot-resolver.service
+Service=kresd.service
 
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/knot-resolver.service b/systemd/kresd.service
similarity index 74%
rename from systemd/knot-resolver.service
rename to systemd/kresd.service
index 68216d09472344df56d96c81f68f3ec98eff9105..27bc6872b0b92f569891a8354fb26d894c4096c9 100644 (file)
--- a/systemd/knot-resolver.service
+++ b/systemd/kresd.service
@@ -7,7 +7,7 @@ RefuseManualStart=true
 [Service]
 Type=notify
 WorkingDirectory=/run/knot-resolver/cache
-ExecStart=/usr/sbin/kresd
+ExecStart=/usr/sbin/kresd -c /etc/knot-resolver/kresd.conf -v -f 1 -k /usr/share/dns/root.key
 User=knot-resolver
 Restart=on-failure
 

diff --git a/systemd/knot-resolver.socket b/systemd/kresd.socket
similarity index 100%
rename from systemd/knot-resolver.socket
rename to systemd/kresd.socket

diff --git a/systemd/tmpfiles/knot-resolver.conf b/systemd/tmpfiles/kresd.conf
similarity index 57%
rename from systemd/tmpfiles/knot-resolver.conf
rename to systemd/tmpfiles/kresd.conf
index 6006f030e17fdb465904c997a549203485794c11..de7875ed2c9d2846cee365d154efa6bd78179425 100644 (file)
--- a/systemd/tmpfiles/knot-resolver.conf
+++ b/systemd/tmpfiles/kresd.conf
@@ -1,7 +1,4 @@
 # tmpfiles.d(5) runtime directory for knot-resolver (kresd)
 #Type Path                            Mode UID           GID          Age Argument
-    d /run/knot-resolver              0750 root          root          -   -
+    d /run/knot-resolver              0751 root          root          -   -
     d /run/knot-resolver/cache        0750 knot-resolver knot-resolver -   -
-    L /run/knot-resolver/cache/config 0750 knot-resolver knot-resolver -   /etc/knot-resolver/kresd.conf
-
-