update default configuration, mark logfile features as windows only

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1143 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index eb6e78fb69210a1d67b5d963e3ba28451a24a779..278ead77edbfae1a92bf6f944cc237c16d86b8d6 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -115,8 +115,8 @@ void declareArguments()
   arg().set("max-tcp-connections","Maximum number of TCP connections")="10";
   arg().setSwitch("no-shuffle","Set this to prevent random shuffling of answers - for regression testing")="off";
 
-  arg().setSwitch( "use-logfile", "Use a log file" )= "no";
-  arg().set( "logfile", "Logfile to use" )= "pdns.log";
+  arg().setSwitch( "use-logfile", "Use a log file (Windows only)" )= "no";
+  arg().set( "logfile", "Logfile to use (Windows only)" )= "pdns.log";
   arg().set("setuid","If set, change user id to this uid for more security")="";
   arg().set("setgid","If set, change group id to this gid for more security")="";
 }

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index 497499ed2c0f06607373470fe02193a219f65793..7a0b53b333cb776924a7941c7631f1738ef6c6ef 100644 (file)
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -125,7 +125,7 @@
 # log-failed-updates=
 
 #################################
-# logfile      Logfile to use
+# logfile      Logfile to use (Windows only)
 #
 # logfile=pdns.log
 
@@ -279,13 +279,18 @@
 #
 # strict-rfc-axfrs=no
 
+#################################
+# trusted-notification-proxy   IP address of incoming notification proxy
+#
+# trusted-notification-proxy=
+
 #################################
 # urlredirector        Where we send hosts to that need to be url redirected
 #
 # urlredirector=127.0.0.1
 
 #################################
-# use-logfile  Use a log file
+# use-logfile  Use a log file (Windows only)
 #
 # use-logfile=no