From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 3 Apr 2014 09:24:12 +0000 (+0000)
Subject: Merge branch 'api-recursor-readonly' of github.com:zeha/pdns into zeha-api-recursor... 
X-Git-Tag: rec-3.6.0-rc1~92^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e85bd610657156cde9654b3f4c697072617c859;p=thirdparty%2Fpdns.git

Merge branch 'api-recursor-readonly' of github.com:zeha/pdns into zeha-api-recursor-readonly

Conflicts:
	pdns/pdns_recursor.cc
---

6e85bd610657156cde9654b3f4c697072617c859
diff --cc pdns/pdns_recursor.cc
index 7a35121e4e,3c4f96be58..d5a1eb274c
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@@ -2099,9 -2091,7 +2099,10 @@@ int main(int argc, char **argv
      ::arg().set("experimental-webserver-port", "Port of webserver to listen on") = "8082";
      ::arg().set("experimental-webserver-password", "Password required for accessing the webserver") = "";
      ::arg().set("experimental-api-config-dir", "Directory where REST API stores config and zones") = "";
 +    ::arg().set("carbon-ourname", "If set, overrides our reported hostname for carbon stats")="";
 +    ::arg().set("carbon-server", "If set, send metrics in carbon (graphite) format to this server")="";
 +    ::arg().set("carbon-interval", "Number of seconds between carbon (graphite) updates")="30";
+     ::arg().set("experimental-api-readonly", "If the JSON API should disallow data modification") = "no";
      ::arg().set("quiet","Suppress logging of questions and answers")="";
      ::arg().set("logging-facility","Facility to log messages as. 0 corresponds to local0")="";
      ::arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;