Arjo Hooimeijer added support for soa-refresh-default, soa-retry-default, soa-expire...

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

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index aea1016c5378aadd93c2ccd5631b8567a14cc844..3add4580a16d6ed2b6ddbb2bfff26c08f8af18ef 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -104,6 +104,11 @@ void declareArguments()
   arg().set("negquery-cache-ttl","Seconds to store packets in the PacketCache")="60";
   arg().set("query-cache-ttl","Seconds to store packets in the PacketCache")="20";
   arg().set("soa-minimum-ttl","Default SOA mininum ttl")="3600";
+
+  arg().set("soa-refresh-default","Default SOA refresh")="10800";
+  arg().set("soa-retry-default","Default SOA retry")="3600";
+  arg().set("soa-expire-default","Default SOA expire")="604800";
+
   arg().set("default-ttl","Seconds a result is valid if not set otherwise")="3600";
   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";

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 069550a2e2fdc45dc9b8abea9fbeda12b27d61ed..ffff05f07a8b1462fb54c00a34d894ed159134b3 100644 (file)
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -433,9 +433,9 @@ void DNSPacket::fillSOAData(const string &content, SOAData &data)
   // fill out data with some plausible defaults:
   // 10800 3600 604800 3600
   data.serial=0;
-  data.refresh=10800;
-  data.retry=3600;
-  data.expire=604800;
+  data.refresh=arg().asNum("soa-refresh-default");;
+  data.retry=arg().asNum("soa-retry-default");;
+  data.expire=arg().asNum("soa-expire-default");;
   data.default_ttl=arg().asNum("soa-minimum-ttl");
 
   vector<string>parts;

diff --git a/pdns/docs/pdns.sgml b/pdns/docs/pdns.sgml
index 19729623ad87e84a0af5d7fa576de0830092a155..96964d500c088fbfa35a1e00fbc6fe782e6f3bfb 100644 (file)
--- a/pdns/docs/pdns.sgml
+++ b/pdns/docs/pdns.sgml
@@ -6245,6 +6245,22 @@ Feb 10 14:16:03 stats: 125784 questions, 13971 cache entries, 309 negative entri
            <listitem><para>
                Our smtpredir MX host. See <xref linkend="fancy-records">.
              </para></listitem></varlistentry>
+         <varlistentry><term>soa-expire-default=604800</term>
+           <listitem><para>
+             Default <link linkend="soa-type">SOA</link> expire.
+             </para></listitem></varlistentry>
+         <varlistentry><term>soa-minimum-ttl=3600</term>
+           <listitem><para>
+             Default <link linkend="soa-type">SOA</link> minimum ttl.
+             </para></listitem></varlistentry>
+         <varlistentry><term>soa-refresh-default=10800</term>
+           <listitem><para>
+             Default <link linkend="soa-type">SOA</link> refresh.
+             </para></listitem></varlistentry>
+         <varlistentry><term>soa-retry-default=3600</term>
+           <listitem><para>
+             Default <link linkend="soa-type">SOA</link> retry.
+             </para></listitem></varlistentry>
          <varlistentry><term>soa-serial-offset=...</term>
            <listitem><para>
              If your database contains single-digit SOA serials and you need to host .DE domains, this setting can help

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index ccf7248921787baba9041028dc3d105746918d8e..ae68a56460e71fa748598025d25f600ed4cbd9fb 100644 (file)
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -224,6 +224,21 @@
 #
 # soa-minimum-ttl=3600
 
+#################################
+# soa-refresh-default  Default SOA refresh
+#
+# soa-refresh-default=10800
+
+#################################
+# soa-retry-default    Default SOA retry
+#
+# soa-retry-default=3600
+
+#################################
+# soa-expire-default   Default SOA expire
+#
+# soa-expire-default=604800
+
 #################################
 # soa-serial-offset    Make sure that no SOA serial is less than this number
 #