Merge remote-tracking branch 'stevee/coreutils-8.19'

diff --git a/pdns-recursor/pdns-recursor.nm b/pdns-recursor/pdns-recursor.nm
index aa22152d539ffaff3aee88284ece3e143d2fae0f..cbcaa2ebea6905b1ffbb2e8b5184cd992027fb18 100644 (file)
--- a/pdns-recursor/pdns-recursor.nm
+++ b/pdns-recursor/pdns-recursor.nm
@@ -5,7 +5,7 @@
 
 name       = pdns-recursor
 version    = 3.3
-release    = 8
+release    = 9
 
 groups     = Networking/DNS
 url        = http://powerdns.com/

diff --git a/pdns-recursor/systemd/pdns-recursor.service b/pdns-recursor/systemd/pdns-recursor.service
index 0d3c99a351237bc149fd79d6490fc700ec8e6cb3..095b595af18a82592c30f5118d2087c1c7f5ad76 100644 (file)
--- a/pdns-recursor/systemd/pdns-recursor.service
+++ b/pdns-recursor/systemd/pdns-recursor.service
@@ -3,7 +3,7 @@ Description=Power DNS Recursor Daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/pdns_recursor --daemon=no
+ExecStart=/usr/sbin/pdns_recursor --config-dir=/etc/pdns --daemon=no
 ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.pid
 ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.controlsocket
 Restart=on-failure