Skip to content

GitLab

Commit 1ecb73e5 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

[master] Merge branch 'trac2126'

parents a77342a6 bb147152
Hide whitespace changes
Inline Side-by-side
configure.ac
View file @ 1ecb73e5
......@@ -1089,7 +1089,7 @@ AC_CONFIG_FILES([Makefile
src/bin/dhcp4/tests/Makefile
src/bin/resolver/Makefile
src/bin/resolver/tests/Makefile
src/bin/showtech/Makefile
src/bin/sysinfo/Makefile
src/bin/sockcreator/Makefile
src/bin/sockcreator/tests/Makefile
src/bin/xfrin/Makefile
......@@ -1227,7 +1227,7 @@ AC_OUTPUT([doc/version.ent
src/bin/zonemgr/zonemgr.spec.pre
src/bin/zonemgr/tests/zonemgr_test
src/bin/zonemgr/run_b10-zonemgr.sh
src/bin/showtech/showtech.py
src/bin/sysinfo/sysinfo.py
src/bin/stats/stats.py
src/bin/stats/stats_httpd.py
src/bin/bind10/bind10_src.py
......
doc/guide/bind10-messages.html
View file @ 1ecb73e5
<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>BIND 10 Messages Manual</title><link rel="stylesheet" href="./bind10-guide.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><meta name="description" content="BIND 10 is a Domain Name System (DNS) suite managed by Internet Systems Consortium (ISC). It includes DNS libraries and modular components for controlling authoritative and recursive DNS servers. This is the messages manual for BIND 10 version 20120712. The most up-to-date version of this document, along with other documents for BIND 10, can be found at ."></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" title="BIND 10 Messages Manual"><div class="titlepage"><div><div><h1 class="title"><a name="id1168229451102"></a>BIND 10 Messages Manual</h1></div><div><p class="releaseinfo">This is the messages manual for BIND 10 version
<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>BIND 10 Messages Manual</title><link rel="stylesheet" href="./bind10-guide.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"><meta name="description" content="BIND 10 is a Domain Name System (DNS) suite managed by Internet Systems Consortium (ISC). It includes DNS libraries and modular components for controlling authoritative and recursive DNS servers. This is the messages manual for BIND 10 version 20120712. The most up-to-date version of this document, along with other documents for BIND 10, can be found at ."></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" title="BIND 10 Messages Manual"><div class="titlepage"><div><div><h1 class="title"><a name="idp98160"></a>BIND 10 Messages Manual</h1></div><div><p class="releaseinfo">This is the messages manual for BIND 10 version
20120712.</p></div><div><p class="copyright">Copyright © 2011-2012 Internet Systems Consortium, Inc.</p></div><div><div class="abstract" title="Abstract"><p class="title"><b>Abstract</b></p><p>BIND 10 is a Domain Name System (DNS) suite managed by
Internet Systems Consortium (ISC). It includes DNS libraries
and modular components for controlling authoritative and
......
src/bin/Makefile.am
View file @ 1ecb73e5
SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq host cmdctl auth xfrin \
xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 \
dbutil showtech
dbutil sysinfo
check-recursive: all-recursive
src/bin/bindctl/bindctl.1
View file @ 1ecb73e5
......@@ -9,6 +9,15 @@
.\"
.TH "BINDCTL" "1" "June 20, 2012" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
......@@ -54,7 +63,7 @@ The PEM formatted server certificate validation chain file\&.
.PP
\fB\-\-csv\-file\-dir\fR\fIfile\fR
.RS 4
The directory name in which the user/password CSV file is stored (see AUTHENTICATION)\&. By default this option doesn\'t have any value, in which case the "\&.bind10" directory under the user\'s home directory will be used\&.
The directory name in which the user/password CSV file is stored (see AUTHENTICATION)\&. By default this option doesn\*(Aqt have any value, in which case the "\&.bind10" directory under the user\*(Aqs home directory will be used\&.
.RE
.PP
\fB\-h\fR, \fB\-\-help\fR
......@@ -105,17 +114,17 @@ prompt shows
\fIparam1 = value1 , \fR\fI\fIparam2 = value2\fR\fR
.PP
\fBbindctl\fR\'s interactive interface provides command\-line completion and hints\&. Press the Tab key to get a hint for the module, command, and/or parameters\&.
\fBbindctl\fR\*(Aqs interactive interface provides command\-line completion and hints\&. Press the Tab key to get a hint for the module, command, and/or parameters\&.
The arrow keys and Emacs\-style editing keys may be used to edit and recall previous lines\&.
.PP
You can use the
\fBhelp\fR
keyword to receive usage assistance for a module or a module\'s command\&.
keyword to receive usage assistance for a module or a module\*(Aqs command\&.
.PP
The
\fBquit\fR
command is used to exit
\fBbindctl\fR\&. (It doesn\'t stop the BIND 10 services\&.)
\fBbindctl\fR\&. (It doesn\*(Aqt stop the BIND 10 services\&.)
.PP
The following module is available by default:
\fBconfig\fR
......
src/bin/cmdctl/b10-cmdctl.8
View file @ 1ecb73e5
......@@ -9,6 +9,15 @@
.\"
.TH "B10\-CMDCTL" "8" "February 28, 2012" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
......
src/bin/resolver/b10-resolver.8
View file @ 1ecb73e5
......@@ -9,6 +9,15 @@
.\"
.TH "B10\-RESOLVER" "8" "February 28, 2012" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
......
src/bin/showtech/.gitignore deleted 100644 → 0
View file @ a77342a6
/b10-showtech
/showtech.py
src/bin/sysinfo/.gitignore 0 → 100644
View file @ 1ecb73e5
/isc-sysinfo
/sysinfo.py
src/bin/showtech/Makefile.am → src/bin/sysinfo/Makefile.am
View file @ 1ecb73e5
bin_SCRIPTS = b10-showtech
bin_SCRIPTS = isc-sysinfo
CLEANFILES = b10-showtech showtech.pyc
CLEANFILES = isc-sysinfo sysinfo.pyc
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
b10-showtech: showtech.py
$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" showtech.py >$@
isc-sysinfo: sysinfo.py
$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" sysinfo.py >$@
chmod a+x $@
MAN1_FILES = \
b10-showtech.xml
isc-sysinfo.xml
man_MANS = \
$(MAN1_FILES:.xml=.1)
......
src/bin/showtech/b10-showtech.1 → src/bin/sysinfo/isc-sysinfo.1
View file @ 1ecb73e5
'\" t
.\" Title: b10-showtech
.\" Title: isc-sysinfo
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: June 26, 2012
.\" Manual: BIND10
.\" Source: BIND10
.\" Language: English
.\"
.TH "B10\-SHOWTECH" "1" "June 26, 2012" "BIND10" "BIND10"
.TH "ISC\-SYSINFO" "1" "June 26, 2012" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -28,14 +28,14 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
b10-showtech \- BIND 10 system information display tool
isc-sysinfo \- BIND 10 system information display tool
.SH "SYNOPSIS"
.HP \w'\fBb10\-showtech\fR\ 'u
\fBb10\-showtech\fR
.HP \w'\fBisc\-sysinfo\fR\ 'u
\fBisc\-sysinfo\fR
.SH "DESCRIPTION"
.PP
The
\fBb10\-showtech\fR
\fBisc\-sysinfo\fR
program collects and outputs a variety of information about the system that BIND 10 is running on\&. This information can be useful to people involved in debugging and technical support\&.
.SH "ARGUMENTS"
.PP
......@@ -47,7 +47,7 @@ Displays usage instructions\&.
\-o \fIoutput\-file\fR
.RS 4
If an output file is specified, the output of
\fBb10\-showtech\fR
\fBisc\-sysinfo\fR
is written to this file\&. By default, the output is written to standard output\&.
.RE
.SH "SEE ALSO"
......@@ -58,7 +58,7 @@ BIND 10 Guide\&.
.SH "HISTORY"
.PP
The
\fBb10\-showtech\fR
\fBisc\-sysinfo\fR
daemon was initially implemented by ISC staff in June, 2012\&.
.SH "COPYRIGHT"
.br
......
src/bin/showtech/b10-showtech.xml → src/bin/sysinfo/isc-sysinfo.xml
View file @ 1ecb73e5
......@@ -24,13 +24,13 @@
</refentryinfo>
<refmeta>
<refentrytitle>b10-showtech</refentrytitle>
<refentrytitle>isc-sysinfo</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo>BIND10</refmiscinfo>
</refmeta>
<refnamediv>
<refname>b10-showtech</refname>
<refname>isc-sysinfo</refname>
<refpurpose>BIND 10 system information display tool</refpurpose>
</refnamediv>
......@@ -43,14 +43,14 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>b10-showtech</command>
<command>isc-sysinfo</command>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
The <command>b10-showtech</command> program collects and outputs a
The <command>isc-sysinfo</command> program collects and outputs a
variety of information about the system that BIND 10 is running
on. This information can be useful to people involved in debugging
and technical support.
......@@ -73,7 +73,7 @@
<term>-o <replaceable class="parameter">output-file</replaceable></term>
<listitem><para>
If an output file is specified, the output
of <command>b10-showtech</command> is written to this file. By
of <command>isc-sysinfo</command> is written to this file. By
default, the output is written to standard output.
</para></listitem>
</varlistentry>
......@@ -95,7 +95,7 @@
<refsect1>
<title>HISTORY</title>
<para>
The <command>b10-showtech</command> daemon was initially
The <command>isc-sysinfo</command> daemon was initially
implemented by ISC staff in June, 2012.
</para>
</refsect1>
......
src/bin/showtech/showtech.py.in → src/bin/sysinfo/sysinfo.py.in
View file @ 1ecb73e5
......@@ -16,7 +16,7 @@
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
"""
BIND 10 showtech program.
ISC sysinfo program.
"""
......
src/bin/zonemgr/b10-zonemgr.8
View file @ 1ecb73e5
......@@ -9,6 +9,15 @@
.\"
.TH "B10\-ZONEMGR" "8" "February 28, 2012" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
......@@ -92,7 +101,7 @@ The configuration commands are:
(sent by
\fBb10-auth\fR(8)) tells
\fBb10\-zonemgr\fR
the zone name and class, and the IP address for the master (source of the NOTIFY message)\&. This will set the zone\'s refresh time to now\&.
the zone name and class, and the IP address for the master (source of the NOTIFY message)\&. This will set the zone\*(Aqs refresh time to now\&.
This is an internal command and not exposed to the administrator\&.
.PP
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment