From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 11 Jan 2018 12:50:52 +0000 (+0100)
Subject: systemd: use persistent cache by default
X-Git-Tag: v2.0.0~38^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ffb00f865bb8cc2156f8f7568d9c4e311bfbf4b;p=thirdparty%2Fknot-resolver.git

systemd: use persistent cache by default

The /run directory is non-persistent. Use /var/cache/knot-resolver
as a persistent cache.
---

diff --git a/daemon/README.rst b/daemon/README.rst
index b58a47e39..e7ce3c000 100644
--- a/daemon/README.rst
+++ b/daemon/README.rst
@@ -65,7 +65,7 @@ The daemon features a CLI interface, type ``help()`` to see the list of availabl
 
 .. code-block:: bash
 
-   $ kresd /var/run/knot-resolver
+   $ kresd /var/cache/knot-resolver
    [system] started in interactive mode, type 'help()'
    > cache.count()
    53
@@ -155,7 +155,7 @@ comfortable in the current working directory.
 
 .. code-block:: sh
 
-	$ kresd /var/run/kresd
+	$ kresd /var/cache/knot-resolver
 
 And you're good to go for most use cases! If you want to use modules or configure daemon behavior, read on.
 
diff --git a/systemd/default/kresd b/systemd/default/kresd
new file mode 100644
index 000000000..c02fbaa3a
--- /dev/null
+++ b/systemd/default/kresd
@@ -0,0 +1,5 @@
+# Used for systemd activation
+KRESD_ARGS="--config=/etc/knot-resolver/kresd.conf --verbose --forks=1 /var/cache/knot-resolver"
+
+# Standalone daemon arguments
+DAEMON_ARGS="--addr=127.0.0.1#53 --addr=::1#53 $KRESD_ARGS"
diff --git a/systemd/kresd.service b/systemd/kresd.service
index 2f8a77ce5..cff4eccbc 100644
--- a/systemd/kresd.service
+++ b/systemd/kresd.service
@@ -4,7 +4,7 @@ Documentation=man:kresd(8)
 
 [Service]
 Type=notify
-WorkingDirectory=/run/knot-resolver/cache
+WorkingDirectory=/var/cache/knot-resolver
 EnvironmentFile=-/etc/default/kresd
 ExecStart=/usr/sbin/kresd $KRESD_ARGS
 User=knot-resolver
diff --git a/systemd/tmpfiles/kresd.conf b/systemd/tmpfiles/kresd.conf
index de7875ed2..e4134fc12 100644
--- a/systemd/tmpfiles/kresd.conf
+++ b/systemd/tmpfiles/kresd.conf
@@ -1,4 +1,3 @@
 # tmpfiles.d(5) runtime directory for knot-resolver (kresd)
 #Type Path                            Mode UID           GID          Age Argument
     d /run/knot-resolver              0751 root          root          -   -
-    d /run/knot-resolver/cache        0750 knot-resolver knot-resolver -   -