Run pdns_recursor on the foreground by default

Closes #3079

diff --git a/build-scripts/debian-recursor/pdns-recursor.init b/build-scripts/debian-recursor/pdns-recursor.init
index 206bf65c6dd16ec64d657f19c2776e1fd6c44301..5ab22c20118320b81c43b8d37fafc8327fb04c3b 100644 (file)
--- a/build-scripts/debian-recursor/pdns-recursor.init
+++ b/build-scripts/debian-recursor/pdns-recursor.init
@@ -43,7 +43,7 @@ start() {
 #  0 if daemon has been started / was already running
 #  >0 if daemon could not be started
   start-stop-daemon --start --oknodo --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null || return 0
-  start-stop-daemon --start --oknodo --quiet --pidfile $PIDFILE --exec $DAEMON || return 2
+  start-stop-daemon --start --oknodo --quiet --pidfile $PIDFILE --exec $DAEMON -- --daemon=yes || return 2
 }
 
 start_resolvconf() {

diff --git a/docs/markdown/recursor/settings.md b/docs/markdown/recursor/settings.md
index cb0e015641eb6246dcaf1a25336eb3839a946b2e..d2fad962d58391364e78931a4dcdef29bd36f5b4 100644 (file)
--- a/docs/markdown/recursor/settings.md
+++ b/docs/markdown/recursor/settings.md
@@ -144,7 +144,7 @@ When running multiple recursors on the same server, read settings from
 
 ## `daemon`
 * Boolean
-* Default: yes
+* Default: no (since 4.0.0, 'yes' before 4.0.0)
 
 Operate in the background.
 

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 67163aeb3de66bd83b1116b8d99ac8e090c10580..87f1472737075897531a47d88e71bc31b1e58264 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2550,7 +2550,7 @@ int main(int argc, char **argv)
     ::arg().setSwitch("non-local-bind", "Enable binding to non-local addresses by using FREEBIND / BINDANY socket options")="no";
     ::arg().set("trace","if we should output heaps of logging. set to 'fail' to only log failing domains")="off";
     ::arg().set("dnssec", "DNSSEC mode: off/process (default)/log-fail/validate")="process";
-    ::arg().set("daemon","Operate as a daemon")="yes";
+    ::arg().set("daemon","Operate as a daemon")="no";
     ::arg().setSwitch("write-pid","Write a PID file")="yes";
     ::arg().set("loglevel","Amount of logging. Higher is more. Do not set below 3")="4";
     ::arg().set("log-common-errors","If we should log rather common errors")="yes";