From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 7 Aug 2011 21:17:04 +0000 (+0200)
Subject: pdns-recursor: Apply default configuration and update systemd files.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5d35c1c8cba2d86d6923e8aeefbb213ca4d6349;p=ipfire-3.x.git

pdns-recursor: Apply default configuration and update systemd files.

Squashed commit of the following:

commit 281610665b623f932c9f23a064885d82b4778d3b
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date:   Sun Aug 7 23:13:19 2011 +0200

    pdns-recursor: Fix typo.

commit dab23e897531056d9d4d33d166dc00ddb371247a
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date:   Sun Aug 7 22:53:20 2011 +0200

    pdns-recursor: Remove shipped config file.

commit 800b254840611026c690d8502afa51a0e682819c
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date:   Sun Aug 7 22:42:50 2011 +0200

    pdns-recursor: Improve systemd service file.

commit d71560c7083d02bdbc9d0ac94235936e20f5fa07
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date:   Sun Aug 7 22:33:22 2011 +0200

    pdns-recursor: Add tmpfile for systemd.

commit f5e7003455eb455780c6638a661201c35efb3ea7
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date:   Sun Aug 7 22:30:15 2011 +0200

    pdns-recursor: Add default config.

commit 882aa37ccdc0bca6d0a1ef39b9629e8c54acbbff
Author: Stefan Schantl <stefan.schantl@ipfire.org>
Date:   Sun Aug 7 21:57:53 2011 +0200

    pdns-recursor: Always restart service.
---

diff --git a/pkgs/pdns-recursor/pdns-recursor.nm b/pkgs/pdns-recursor/pdns-recursor.nm
index 9e4a99555..05a85cc0f 100644
--- a/pkgs/pdns-recursor/pdns-recursor.nm
+++ b/pkgs/pdns-recursor/pdns-recursor.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = pdns-recursor
 PKG_VER        = 3.3
-PKG_REL        = 2
+PKG_REL        = 3
 
 PKG_MAINTAINER =
 PKG_GROUPS     = Networking/DNS
@@ -56,7 +56,18 @@ define STAGE_INSTALL
 	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) \
 		CONFIGDIR=/etc/$(PKG_NAME)
 
+	# Remove sysvinit file
 	rm -rf $(BUILDROOT)/etc/init.d
 
-	mv -v $(BUILDROOT)/etc/$(PKG_NAME)/recursor.conf{-dist,}
+	# Remove shipped config file
+	rm -rf $(BUILDROOT)/etc/$(PKG_NAME)/recursor.conf-dist
+
+	# Install our default config file
+	cp -vf $(DIR_SOURCE)/recursor.conf $(BUILDROOT)/etc/$(PKG_NAME)/recursor.conf
+
+	# Create folder for chroot
+	-mkdir -pv $(BUILDROOT)/var/lib/pdns-recursor
 endef
+
+# XXX Need to create user and group "pdns-recursor" at installation
+# useradd -r -g pdns-recursor pdns-recursor -d /var/lib/pdns-recursor -s /sbin/nologin
diff --git a/pkgs/pdns-recursor/pdns-recursor.tmpfiles b/pkgs/pdns-recursor/pdns-recursor.tmpfiles
new file mode 100644
index 000000000..2fbee002e
--- /dev/null
+++ b/pkgs/pdns-recursor/pdns-recursor.tmpfiles
@@ -0,0 +1 @@
+d /run/pdns-recursor 0755 pdns-recursor pdns-recursor -
diff --git a/pkgs/pdns-recursor/recursor.conf b/pkgs/pdns-recursor/recursor.conf
new file mode 100644
index 000000000..7ecc30b65
--- /dev/null
+++ b/pkgs/pdns-recursor/recursor.conf
@@ -0,0 +1,13 @@
+
+# XXX IPv6 listen on :: cannot be created. Says Address is already in use.
+local-address=0.0.0.0 ::1
+
+socket-dir=/run/pdns-recursor
+socket-group=pdns-recursor
+socket-owner=pdns-recursor
+socket-mode=660
+
+# Security settings
+chroot=/var/lib/pdns-recursor
+setgid=pdns-recursor
+setuid=pdns-recursor
diff --git a/pkgs/pdns-recursor/systemd/pdns-recursor.service b/pkgs/pdns-recursor/systemd/pdns-recursor.service
index b30521eb2..f0aa1abce 100644
--- a/pkgs/pdns-recursor/systemd/pdns-recursor.service
+++ b/pkgs/pdns-recursor/systemd/pdns-recursor.service
@@ -4,6 +4,9 @@ After=network.target
 
 [Service]
 ExecStart=/usr/sbin/pdns_recursor --daemon=no
+ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.pid
+ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.controlsocket
+Restart=always
 
 [Install]
 WantedBy=multi-user.target