Do not ship dqcache-start, prefer the systemd unit

5 files changed, 36 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08eb0afc0d20..be2da9b7f57f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dq
 	pkgdesc = Small recursive DNS server and tools with DNSCurve support
 	pkgver = 20181021
-	pkgrel = 1
+	pkgrel = 2
 	url = https://mojzis.com/software/dq/
 	install = dq.install
 	arch = x86_64
@@ -22,9 +22,9 @@ pkgbase = dq
 	sha512sums = SKIP
 	sha512sums = 1444d75a559769044cabca730a11846f14c8db0096a33464fbd90b8c1f363525088b55801ea29554b46906792097ce8a84f1f5e763f018270600408cc9404614
 	sha512sums = 0c19ce8d81bf2bed090e232c338dce466e7ff172f8698f7ecbff59a999a534bc37d2a194d3749a3fea5d3b0c26ff283526861beefd4bef810caa022beff58c5d
-	sha512sums = 1d374937af59ea43237fcdc5089f940c9b97240a22ccc9ad6ea9ece450550dddb82c0bba4f579cf1a89baa184698fa2d7d4f1eee7ce88e070521b55a72c49ec4
+	sha512sums = ab2e577ca9c18afee40704593119f3b10d21eb5c4cb5c77d7d7e8652687213f2bf67491aed4c0b4c194251f17909502b965e566dfbde64b052dde9dc0b8343f6
 	sha512sums = ab7fcf301cfcbc1fa70ec6ff914c8b33b8c868e305990351d0dac5d28832a60368af3a79bbd635742583801eb8bf4226aac0c9e478d40c3b180f1d68e946bf0a
-	sha512sums = 709ac3e2553a7a035b46622288857d6b2bcf249f3a568400a3d973ead759a65e286f7717b591dee0bef7374f34a61e1600610f8dc526377f666cdf8440e48462
+	sha512sums = f63008d6e50011a76ef5b7372ae01ef33eac598adc310d2d09980089510720d23767534694179014fc9e9e3a5f9473cb60dd4af3e3fa92616912003b1bd7cbb5
 
 pkgname = dq
 
diff --git a/PKGBUILD b/PKGBUILD
index e4ab9f106638..bf8628a85c72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Adrian Perez <aperez@igalia.com>
 pkgname='dq'
 pkgver='20181021'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='Small recursive DNS server and tools with DNSCurve support'
 url='https://mojzis.com/software/dq/'
 arch=('x86_64' 'i686')
@@ -17,9 +17,9 @@ sha512sums=('2f59b96e08dc452ee0db2b5e6f9546a6c279d125cbc85052ed2ae3b7fabb43067d4
             'SKIP'
             '1444d75a559769044cabca730a11846f14c8db0096a33464fbd90b8c1f363525088b55801ea29554b46906792097ce8a84f1f5e763f018270600408cc9404614'
             '0c19ce8d81bf2bed090e232c338dce466e7ff172f8698f7ecbff59a999a534bc37d2a194d3749a3fea5d3b0c26ff283526861beefd4bef810caa022beff58c5d'
-            '1d374937af59ea43237fcdc5089f940c9b97240a22ccc9ad6ea9ece450550dddb82c0bba4f579cf1a89baa184698fa2d7d4f1eee7ce88e070521b55a72c49ec4'
+            'ab2e577ca9c18afee40704593119f3b10d21eb5c4cb5c77d7d7e8652687213f2bf67491aed4c0b4c194251f17909502b965e566dfbde64b052dde9dc0b8343f6'
             'ab7fcf301cfcbc1fa70ec6ff914c8b33b8c868e305990351d0dac5d28832a60368af3a79bbd635742583801eb8bf4226aac0c9e478d40c3b180f1d68e946bf0a'
-            '709ac3e2553a7a035b46622288857d6b2bcf249f3a568400a3d973ead759a65e286f7717b591dee0bef7374f34a61e1600610f8dc526377f666cdf8440e48462')
+            'f63008d6e50011a76ef5b7372ae01ef33eac598adc310d2d09980089510720d23767534694179014fc9e9e3a5f9473cb60dd4af3e3fa92616912003b1bd7cbb5')
 
 build () {
 	cd "${pkgname}-${pkgver}"
@@ -35,13 +35,10 @@ package () {
 	install -m 755 -d "${pkgdir}/usr/lib/dq"
 	mv "${pkgdir}/usr/bin/dqcache" "${pkgdir}/usr/lib/dq/"
 
-	# Manpages are no installed by "make install"
-	install -m 644 -D man/dq.1 \
-		"${pkgdir}/usr/share/man/man1/dq.1"
-	install -m 644 -D man/dqcache-makekey.1 \
-		"${pkgdir}/usr/share/man/man1/dqcache-makekey.1"
-	install -m 644 -D man/dqcache.8 \
-		"${pkgdir}/usr/share/man/man8/dqcache.8"
+	# Do not ship dqcache-start; the supplied systemd unit has its own
+	# wrapper program.
+	rm "${pkgdir}/usr/bin/dqcache-start" \
+	   "${pkgdir}/usr/share/man/man1/dqcache-start.1"
 
 	install -m 644 -D LICENCE.md \
 		"${pkgdir}/usr/share/licenses/${pkgname}/LICENCE.md"
diff --git a/default.conf b/default.conf
index 3509d3b5a0df..f1c467776768 100644
--- a/default.conf
+++ b/default.conf
@@ -1,4 +1,4 @@
 # Default configuration for the dqcache DNS server
-ROOT=/etc/dqcache/default
 CACHESIZE=10000000
+VERBOSELOG=0
 IP=127.0.0.1
diff --git a/dqcache.sh b/dqcache.sh
index e0640050aadf..bb9bebb60355 100755
--- a/dqcache.sh
+++ b/dqcache.sh
@@ -1,9 +1,28 @@
 #! /bin/bash
+
+: ${USER:=dqcache}
+: ${GROUP:=dqcache}
+
 if [[ ${UID} -ne 0 && ${EUID} -ne 0 ]] ; then
 	echo "$0: Must run as root." 1>&2
 	exit 1
 fi
+
+if [[ -z ${ROOT} ]] ; then
+	echo "$0: Undefined variable ROOT." 1>&2
+	exit 1
+fi
+
+if [[ ! -d ${ROOT}/dump ]] ; then
+	mkdir -p "${ROOT}/dump"
+	chown "${USER}:${GROUP}" "${ROOT}/dump"
+fi
+
+if [[ -z ${VERBOSELOG} || ${VERBOSELOG} -eq 0 ]] ; then
+	exec &> /dev/null
+fi
+
 exec /usr/bin/env \
-	UID=$(id -u "${USER:-dqcache}") \
-	GID=$(id -g "${GROUP:-dqcache}") \
+	UID=$(id -u "${USER}") \
+	GID=$(id -g "${GROUP}") \
 	/usr/lib/dq/dqcache
diff --git a/dqcache@.service b/dqcache@.service
index 24f248afb114..bd4cf5bb94e6 100644
--- a/dqcache@.service
+++ b/dqcache@.service
@@ -9,8 +9,10 @@ Restart=always
 PrivateTmp=true
 PrivateDevices=true
 ProtectSystem=true
-WorkingDirectory=/etc/dqcache
-EnvironmentFile=/etc/dqcache/%i.conf
+WorkingDirectory=/etc/dqcache/%i
+EnvironmentFile=-/etc/dqcache/%i.conf
+EnvironmentFile=/etc/dqcache/%i/config
+Environment=ROOT=/etc/dqcache/%i
 ExecStart=/usr/bin/dqcache
 
 [Install]