Add calidns manpage and add to pdns-tools

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index a1212a457f5179a26f4bc5a9de938e9024017f0c..d15af6a56370347a756a3a1e9f3df543fca8d6e1 100755 (executable)
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -246,6 +246,7 @@ fi
 %{_bindir}/nsec3dig
 %{_bindir}/saxfr
 %{_bindir}/sdig
+%{_mandir}/man1/calidns.1.gz
 %{_mandir}/man1/dnsbulktest.1.gz
 %{_mandir}/man1/dnsgram.1.gz
 %{_mandir}/man1/dnsreplay.1.gz
@@ -518,6 +519,7 @@ exit 0
 %{_bindir}/nsec3dig
 %{_bindir}/saxfr
 %{_bindir}/sdig
+%{_mandir}/man1/calidns.1.gz
 %{_mandir}/man1/dnsbulktest.1.gz
 %{_mandir}/man1/dnsgram.1.gz
 %{_mandir}/man1/dnsreplay.1.gz
@@ -773,6 +775,7 @@ exit 0
 %{_bindir}/nsec3dig
 %{_bindir}/saxfr
 %{_bindir}/sdig
+%{_mandir}/man1/calidns.1.gz
 %{_mandir}/man1/dnsbulktest.1.gz
 %{_mandir}/man1/dnsgram.1.gz
 %{_mandir}/man1/dnsreplay.1.gz

diff --git a/build-scripts/debian-authoritative/pdns-tools.install b/build-scripts/debian-authoritative/pdns-tools.install
index c6d8196191bd5bef134bcfeea1c370bf0bf6ab4d..046caf0c4f24396602fbd05031a31c1eacfd4fc5 100644 (file)
--- a/build-scripts/debian-authoritative/pdns-tools.install
+++ b/build-scripts/debian-authoritative/pdns-tools.install
@@ -1,3 +1,4 @@
+usr/bin/calidns
 usr/bin/dnsbulktest
 usr/bin/dnsgram
 usr/bin/dnsreplay

diff --git a/build-scripts/debian-authoritative/pdns-tools.manpages b/build-scripts/debian-authoritative/pdns-tools.manpages
index bb90d803bacbdec2fcf69b27d10b739220fe0207..b3e8663a4f15437e563e1bbbbfc7f0dc0f771114 100644 (file)
--- a/build-scripts/debian-authoritative/pdns-tools.manpages
+++ b/build-scripts/debian-authoritative/pdns-tools.manpages
@@ -1,3 +1,4 @@
+debian/tmp/usr/share/man/man1/calidns.1
 debian/tmp/usr/share/man/man1/dnsbulktest.1
 debian/tmp/usr/share/man/man1/dnsgram.1
 debian/tmp/usr/share/man/man1/dnsreplay.1

diff --git a/docs/Makefile.am b/docs/Makefile.am
index a20c6a17162ba5074f6a9dbbe56eaab197c99e8a..4a6eb6bbe5b95dfe1faa30d1e37424cdf29275f1 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -5,7 +5,8 @@ MANPAGES_TARGET_AUTH = pdns_server.1 \
        zone2ldap.1 \
        zone2sql.1
 
-MANPAGES_TARGET_TOOLS = dnsbulktest.1 \
+MANPAGES_TARGET_TOOLS = calidns.1 \
+       dnsbulktest.1 \
        dnsgram.1 \
        dnsreplay.1 \
        dnsscan.1 \

diff --git a/docs/manpages/calidns.1.md b/docs/manpages/calidns.1.md
new file mode 100644 (file)
index 0000000..ee434e4
--- /dev/null
+++ b/docs/manpages/calidns.1.md
@@ -0,0 +1,31 @@
+% CALIDNS(1)
+% PowerDNS.com BV
+% April 2016
+
+# NAME
+**calidns** - A DNS recursor testing tool
+
+# SYNOPSIS
+**calidns** *QUERY_FILE* *DESTINATION* *INITIAL_QPS* *HITRATE*
+
+# DESCRIPTION
+**calidns** reads queries from *QUERY_FILE* and sends them as a recursive query to
+*DESTINATION* (an IPv4 or IPv6 address, optionally with a port number), starting
+at INITIAL_QPS queries per second and aims to have a cache hitrate of *HITRATE*
+percent.
+
+It will then try to determine the maximum amount of queries per second the recursor
+can handle with the aforementioned *HITRATE*.
+
+# QUERY_FILE format
+The format of the *QUERY_FILE* is very simple, it should contain "QNAME<space>QTYPE"
+tuples, one per line. For example:
+
+powerdns.com A
+powerdns.com AAAA
+google.com A
+
+This is similar to Alexa top 1 million list.
+
+# OPTIONS
+None

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 5aacda9c76ec6561be123a32964881bc63d63a6b..7e2f5ee7497740f7befe5701a28b293cc4947610 100644 (file)
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -89,6 +89,7 @@ pages:
     - Documentation details: appendix/documentation.md
     - Compiling PowerDNS: appendix/compiling-powerdns.md
     - DNS Analysis Tools: tools/analysis.md
+    - 'Manpage: calidns.1': manpages/calidns.1.md
     - 'Manpage: dnsbulktest.1': manpages/dnsbulktest.1.md
     - 'Manpage: dnsgram.1': manpages/dnsgram.1.md
     - 'Manpage: dnsreplay.1': manpages/dnsreplay.1.md