From: Tomas Krizek Date: Fri, 9 Feb 2018 11:09:38 +0000 (+0100) Subject: systemd: provide kresd arguments in ExecStart= X-Git-Tag: v2.1.0~1^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24711da7f113641b3289d35e7bdc96e2c426b852;p=thirdparty%2Fknot-resolver.git systemd: provide kresd arguments in ExecStart= To avoid using /etc/default/kresd, provide the needed arguments directly in the ExecStart= in the kresd@.service. --- diff --git a/systemd/default/kresd b/systemd/default/kresd deleted file mode 100644 index 3ecd6fc5a..000000000 --- a/systemd/default/kresd +++ /dev/null @@ -1,5 +0,0 @@ -# Used for systemd activation -KRESD_ARGS="--config=/etc/knot-resolver/kresd.conf" - -# 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 acfa80bd6..0b6a302ed 100644 --- a/systemd/kresd@.service +++ b/systemd/kresd@.service @@ -5,8 +5,7 @@ Documentation=man:kresd(8) [Service] Type=notify WorkingDirectory=/var/cache/knot-resolver -EnvironmentFile=-/etc/default/kresd -ExecStart=/usr/sbin/kresd $KRESD_ARGS +ExecStart=/usr/sbin/kresd --config=/etc/knot-resolver/kresd.conf User=knot-resolver Restart=on-failure Sockets=kresd.socket