Commit ab4d2090 authored by Mukund Sivaraman's avatar Mukund Sivaraman

Merge branch 'master' into trac2171

parents b71313c0 ecb6a3aa
...@@ -35,3 +35,4 @@ TAGS ...@@ -35,3 +35,4 @@ TAGS
/coverage-cpp-html /coverage-cpp-html
/dns++.pc /dns++.pc
/report.info /report.info
/logger_lockfile
458. [build]* jinmei
BIND 10 now relies on Boost offset_ptr, which caused some new
portability issues. Such issues are detected at ./configure time.
If ./configure stops due to this, try the following workaround:
- If it's about the use of mutable for a reference with clang++,
upgrade Boost version to 1.44 or higher, or try a different
compiler (e.g. g++ generally seems to be free from this issue)
- If it's about the use of "variadic templates", specify
--without-werror so the warning won't be promoted to an error.
Specifying BOOST_NO_USER_CONFIG in CXXFLAGS may also work
(which would be the case if Boost is installed via pkgsrc)
(Trac #2147, git 30061d1139aad8716e97d6b620c259752fd0a3cd)
457. [build]* muks 457. [build]* muks
BIND 10 library names now have a "b10-" prefix. This is to avoid BIND 10 library names now have a "b10-" prefix. This is to avoid
clashes with other similarly named libraries on the system. clashes with other similarly named libraries on the system.
...@@ -32,7 +45,7 @@ ...@@ -32,7 +45,7 @@
(Trac #1986, git bd6b0a5ed3481f78fb4e5cb0b18c7b6e5920f9f8) (Trac #1986, git bd6b0a5ed3481f78fb4e5cb0b18c7b6e5920f9f8)
452. [func]* muks 452. [func]* muks
b10-showtech: An initial implementation of the b10-showtech tool isc-sysinfo: An initial implementation of the isc-sysinfo tool
is now available. It gathers and outputs system information which is now available. It gathers and outputs system information which
can be used by future tech support staff. can be used by future tech support staff.
(Trac #2062, git 144e80212746f8d55e6a59edcf689fec9f32ae95) (Trac #2062, git 144e80212746f8d55e6a59edcf689fec9f32ae95)
......
...@@ -809,6 +809,17 @@ AC_TRY_COMPILE([ ...@@ -809,6 +809,17 @@ AC_TRY_COMPILE([
CPPFLAGS_BOOST_THREADCONF="-DBOOST_DISABLE_THREADS=1"], CPPFLAGS_BOOST_THREADCONF="-DBOOST_DISABLE_THREADS=1"],
[AC_MSG_RESULT(yes)]) [AC_MSG_RESULT(yes)])
# Boost offset_ptr is required in one library (not optional right now), and
# it's known it doesn't compile on some platforms, depending on boost version,
# its local configuration, and compiler.
AC_MSG_CHECKING([Boost offset_ptr compiles])
AC_TRY_COMPILE([
#include <boost/interprocess/offset_ptr.hpp>
],,
[AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
AC_MSG_ERROR([Failed to compile a required header file. Try upgrading Boost to 1.44 or higher (when using clang++) or specifying --without-werror. See the ChangeLog entry for Trac no. 2147 for more details.])])
CPPFLAGS="$CPPFLAGS_SAVES $CPPFLAGS_BOOST_THREADCONF" CPPFLAGS="$CPPFLAGS_SAVES $CPPFLAGS_BOOST_THREADCONF"
AC_SUBST(BOOST_INCLUDES) AC_SUBST(BOOST_INCLUDES)
...@@ -1078,7 +1089,7 @@ AC_CONFIG_FILES([Makefile ...@@ -1078,7 +1089,7 @@ AC_CONFIG_FILES([Makefile
src/bin/dhcp4/tests/Makefile src/bin/dhcp4/tests/Makefile
src/bin/resolver/Makefile src/bin/resolver/Makefile
src/bin/resolver/tests/Makefile src/bin/resolver/tests/Makefile
src/bin/showtech/Makefile src/bin/sysinfo/Makefile
src/bin/sockcreator/Makefile src/bin/sockcreator/Makefile
src/bin/sockcreator/tests/Makefile src/bin/sockcreator/tests/Makefile
src/bin/xfrin/Makefile src/bin/xfrin/Makefile
...@@ -1216,7 +1227,7 @@ AC_OUTPUT([doc/version.ent ...@@ -1216,7 +1227,7 @@ AC_OUTPUT([doc/version.ent
src/bin/zonemgr/zonemgr.spec.pre src/bin/zonemgr/zonemgr.spec.pre
src/bin/zonemgr/tests/zonemgr_test src/bin/zonemgr/tests/zonemgr_test
src/bin/zonemgr/run_b10-zonemgr.sh 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.py
src/bin/stats/stats_httpd.py src/bin/stats/stats_httpd.py
src/bin/bind10/bind10_src.py src/bin/bind10/bind10_src.py
......
...@@ -1485,134 +1485,154 @@ can use various data source backends. ...@@ -1485,134 +1485,154 @@ can use various data source backends.
</section> </section>
<section> <section id='datasrc'>
<title>Data Source Backends</title> <title>Data Source Backends</title>
<para>
Bind 10 has the concept of data sources. A data source is a place
where authoritative zone data reside and where they can be served
from. This can be a master file, a database or something completely
different.
</para>
<para>
Once a query arrives, <command>b10-auth</command> goes through a
configured list of data sources and finds the one containing a best
matching zone. From the equally good ones, the first one is taken.
This data source is then used to answer the query.
</para>
<note><para> <note><para>
For the development prototype release, <command>b10-auth</command> In the development prototype release, <command>b10-auth</command>
supports a SQLite3 data source backend and in-memory data source can serve data from a SQLite3 data source backend and from master
backend. files.
Upcoming versions will be able to use multiple different Upcoming versions will be able to use multiple different
data sources, such as MySQL and Berkeley DB. data sources, such as MySQL and Berkeley DB.
</para></note> </para></note>
<para> <para>
By default, the SQLite3 backend uses the data file located at The configuration is located in data_sources/classes. Each item there
represents one RR class and a list used to answer queries for that
class. The default contains two classes. The CH class contains a static
data source &mdash; one that serves things like
<quote>AUTHORS.BIND.</quote>. The IN class contains single SQLite3
data source with database file located at
<filename>/usr/local/var/bind10-devel/zone.sqlite3</filename>. <filename>/usr/local/var/bind10-devel/zone.sqlite3</filename>.
(The full path is what was defined at build configure time for
<option>--localstatedir</option>.
The default is <filename>/usr/local/var/</filename>.)
This data file location may be changed by defining the
<quote>database_file</quote> configuration.
</para> </para>
<section id="in-memory-datasource"> <para>
<title>In-memory Data Source</title> Each data source has several options. The first one is
<varname>type</varname>, which specifies the type of data source to
<para> use. Valid types include the ones listed below, but bind10 uses
<!-- How to configure it. --> dynamically loaded modules for them, so there may be more in your
The following commands to <command>bindctl</command> case. This option is mandatory.
provide an example of configuring an in-memory data </para>
source containing the <quote>example.com</quote> zone
with the zone file named <quote>example.com.zone</quote>:
<!--
<screen>&gt; <userinput> config set Auth/datasources/ [{"type": "memory", "zones": [{"origin": "example.com", "file": "example.com.zone"}]}]</userinput></screen>
-->
<screen>&gt; <userinput>config add Auth/datasources</userinput>
&gt; <userinput>config set Auth/datasources[0]/type "<option>memory</option>"</userinput>
&gt; <userinput>config add Auth/datasources[0]/zones</userinput>
&gt; <userinput>config set Auth/datasources[0]/zones[0]/origin "<option>example.com</option>"</userinput>
&gt; <userinput>config set Auth/datasources[0]/zones[0]/file "<option>example.com.zone</option>"</userinput>
&gt; <userinput>config commit</userinput></screen>
The authoritative server will begin serving it immediately
after the zone data is loaded from the master text file.
</para>
</section>
<section id="in-memory-datasource-with-sqlite3-backend">
<title>In-memory Data Source with SQLite3 Backend</title>
<para>
<!-- How to configure it. -->
The following commands to <command>bindctl</command>
provide an example of configuring an in-memory data
source containing the <quote>example.org</quote> zone
with a SQLite3 backend file named <quote>example.org.sqlite3</quote>:
<!--
<screen>&gt; <userinput> config set Auth/datasources/ [{"type": "memory", "zones": [{"origin": "example.org", "file": "example.org.sqlite3", "filetype": "sqlite3"}]}]</userinput></screen>
-->
<screen>&gt; <userinput>config add Auth/datasources</userinput>
&gt; <userinput>config set Auth/datasources[1]/type "<option>memory</option>"</userinput>
&gt; <userinput>config add Auth/datasources[1]/zones</userinput>
&gt; <userinput>config set Auth/datasources[1]/zones[0]/origin "<option>example.org</option>"</userinput>
&gt; <userinput>config set Auth/datasources[1]/zones[0]/file "<option>example.org.sqlite3</option>"</userinput>
&gt; <userinput>config set Auth/datasources[1]/zones[0]/filetype "<option>sqlite3</option>"</userinput>
&gt; <userinput>config commit</userinput></screen>
The authoritative server will begin serving it immediately
after the zone data is loaded from the database file.
</para>
</section>
<section id="in-memory-datasource-loading">
<title>Reloading an In-memory Data Source</title>
<para>
Use the <command>Auth loadzone</command> command in
<command>bindctl</command> to reload a changed master
file into memory; for example:
<screen>&gt; <userinput>Auth loadzone origin="example.com"</userinput> <para>
</screen> Another option is <varname>params</varname>. This option is type
specific; it holds different data depending on the type
above. Also, depending on the type, it could be possible to omit it.
</para>
</para> <para>
There are two options related to the so-called cache. If you enable
cache, zone data from the data source are loaded into memory.
Then, when answering a query, <command>b10-auth</command> looks
into the memory only instead of the data source, which speeds
answering up. The first option is <varname>cache-enable</varname>,
a boolean value turning the cache on and off (off is the default).
The second one, <varname>cache-zones</varname>, is a list of zone
origins to load into in-memory. Remember that zones in the data source
not listed here will not be loaded and will not be available at all.
</para>
<!-- <section id='datasource-types'>
<title>Data source types</title>
<para> <para>
The <varname>file</varname> may be an absolute path to the As mentioned, the type used by default is <quote>sqlite3</quote>.
master zone file or it is relative to the directory BIND 10 is It has single configuration option inside <varname>params</varname>
started from. &mdash; <varname>database_file</varname>, which contains the path
</para> to the sqlite3 file containing the data.
--> </para>
<para>
Another type is called <quote>MasterFiles</quote>. This one is
slightly special. The data are stored in RFC1034 master files.
Because answering directly from them would be impractical,
this type mandates the cache to be enabled. Also, the list of
zones (<varname>cache-zones</varname>) should be omitted. The
<varname>params</varname> is a dictionary mapping from zone
origins to the files they reside in.
</para>
</section> </section>
<section id="in-memory-datasource-disabling">
<title>Disabling In-memory Data Sources</title>
<section id='datasrc-examples'>
<title>Examples</title>
<para> <para>
By default, the memory data source is disabled; it must be As this is one of the more complex configurations of Bind10,
configured explicitly. To disable all the in-memory zones, we show some examples. They all assume they start with default
specify a null list for <varname>Auth/datasources</varname>: configuration.
</para>
<!-- TODO: this assumes that Auth/datasources is for memory only --> <para>
First, let's disable the static data source
(<quote>VERSION.BIND</quote> and friends). As it is the only
data source in the CH class, we can remove the whole class.
<screen>&gt; <userinput>config set Auth/datasources/ []</userinput> <screen>&gt; <userinput>config remove data_sources/classes CH</userinput>
&gt; <userinput>config commit</userinput></screen> &gt; <userinput>config commit</userinput></screen>
</para> </para>
<para> <para>
The following example stops serving a specific zone: Another one, let's say our default data source contains zones
<quote>example.org.</quote> and <quote>example.net.</quote>.
We want them to be served from memory to make the answering
faster.
<screen>&gt; <userinput>config remove Auth/datasources[<option>0</option>]/zones[<option>0</option>]</userinput> <screen>&gt; <userinput>config set data_sources/classes/IN[0]/cache-enable true</userinput>
&gt; <userinput>config add data_sources/classes/IN[0]/cache-zones example.org.</userinput>
&gt; <userinput>config add data_sources/classes/IN[0]/cache-zones example.net.</userinput>
&gt; <userinput>config commit</userinput></screen> &gt; <userinput>config commit</userinput></screen>
(Replace the list number(s) in Now every time the zone in the data source is changed by the
<varname>datasources[<replaceable>0</replaceable>]</varname> operator, Bind10 needs to be told to reload it, by
and/or <varname>zones[<replaceable>0</replaceable>]</varname> <screen>&gt; <userinput>Auth loadzone example.org</userinput></screen>
for the relevant zone as needed.) You don't need to do this when the zone is modified by
XfrIn, it does so automatically.
</para>
<para>
Now, the last example is when there are master files we want to
serve in addition to whatever is inside the sqlite3 database.
</para> <screen>&gt; <userinput>config add data_sources/classes/IN</userinput>
&gt; <userinput>config set data_sources/classes/IN[1]/type MasterFiles</userinput>
&gt; <userinput>config set data_sources/classes/IN[1]/cache-enable true</userinput>
&gt; <userinput>config set data_sources/classes/IN[1]/params { "example.org": "/path/to/example.org", "example.com": "/path/to/example.com" }</userinput>
&gt; <userinput>config commit</userinput></screen>
Unfortunately, due to current technical limitations, the params must
be set as one JSON blob, it can't be edited in
<command>bindctl</command>. To reload a zone, you the same command
as above.
</para>
</section> </section>
<note>
<para>
There's also <varname>Auth/database_file</varname> configuration
variable, pointing to a sqlite3 database file. This is no longer
used by <command>b10-auth</command>, but it is left in place for
now, since other modules use it. Once <command>b10-xfrin</command>,
<command>b10-xfrout</command> and <command>b10-ddns</command>
are ported to the new configuration, this will disappear. But for
now, make sure that if you use any of these modules, the new
and old configuration correspond. The defaults are consistent, so
unless you tweaked either the new or the old configuration, you're
good.
</para>
</note>
</section> </section>
<section> <section>
...@@ -1854,7 +1874,7 @@ http://bind10.isc.org/wiki/ScalableZoneLoadDesign#a7.2UpdatingaZone ...@@ -1854,7 +1874,7 @@ http://bind10.isc.org/wiki/ScalableZoneLoadDesign#a7.2UpdatingaZone
The administrator doesn't have to do anything for The administrator doesn't have to do anything for
<command>b10-auth</command> to serve the new version of the <command>b10-auth</command> to serve the new version of the
zone, except for the configuration such as the one described in zone, except for the configuration such as the one described in
<xref linkend="in-memory-datasource-with-sqlite3-backend" />. <xref linkend="datasrc" />.
</para> </para>
</section> </section>
...@@ -1965,11 +1985,11 @@ what is XfroutClient xfr_client?? ...@@ -1965,11 +1985,11 @@ what is XfroutClient xfr_client??
notify <command>b10-xfrout</command> so that other secondary notify <command>b10-xfrout</command> so that other secondary
servers will be notified via the DNS NOTIFY protocol. servers will be notified via the DNS NOTIFY protocol.
In addition, if <command>b10-auth</command> serves the updated In addition, if <command>b10-auth</command> serves the updated
zone from its in-memory cache (as described in zone (as described in
<xref linkend="in-memory-datasource-with-sqlite3-backend" />), <xref linkend="datasrc" />),
<command>b10-ddns</command> will also <command>b10-ddns</command> will also
notify <command>b10-auth</command> so that <command>b10-auth</command> notify <command>b10-auth</command> so that <command>b10-auth</command>
will re-cache the updated zone content. will re-cache the updated zone content if necessary.
</para> </para>
<para> <para>
...@@ -2548,7 +2568,7 @@ const std::string HARDCODED_SERVER_ID = "192.0.2.1";</screen> ...@@ -2548,7 +2568,7 @@ const std::string HARDCODED_SERVER_ID = "192.0.2.1";</screen>
</section> </section>
<section id="dhcp4-limit"> <section id="dhcp4-limit">
<title>DHCPv4 Server Limitations</title> <title>DHCPv4 Server Limitations</title>
<para>These are the current limitations of the DHCPv4 server <para>These are the current limitations of the DHCPv4 server
software. Most of them are reflections of the early stage of software. Most of them are reflections of the early stage of
development and should be treated as <quote>not implemented development and should be treated as <quote>not implemented
......
<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 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 Internet Systems Consortium (ISC). It includes DNS libraries
and modular components for controlling authoritative and and modular components for controlling authoritative and
......
SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq host cmdctl auth xfrin \ SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq host cmdctl auth xfrin \
xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 \ xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 \
dbutil showtech dbutil sysinfo
check-recursive: all-recursive check-recursive: all-recursive
...@@ -9,6 +9,15 @@ ...@@ -9,6 +9,15 @@
.\" .\"
.TH "BINDCTL" "1" "June 20, 2012" "BIND10" "BIND10" .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 .\" * set default formatting
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" disable hyphenation .\" disable hyphenation
...@@ -54,7 +63,7 @@ The PEM formatted server certificate validation chain file\&. ...@@ -54,7 +63,7 @@ The PEM formatted server certificate validation chain file\&.
.PP .PP
\fB\-\-csv\-file\-dir\fR\fIfile\fR \fB\-\-csv\-file\-dir\fR\fIfile\fR
.RS 4 .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 .RE
.PP .PP
\fB\-h\fR, \fB\-\-help\fR \fB\-h\fR, \fB\-\-help\fR
...@@ -105,17 +114,17 @@ prompt shows ...@@ -105,17 +114,17 @@ prompt shows
\fIparam1 = value1 , \fR\fI\fIparam2 = value2\fR\fR \fIparam1 = value1 , \fR\fI\fIparam2 = value2\fR\fR
.PP .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\&. The arrow keys and Emacs\-style editing keys may be used to edit and recall previous lines\&.
.PP .PP
You can use the You can use the
\fBhelp\fR \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 .PP
The The
\fBquit\fR \fBquit\fR
command is used to exit 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 .PP
The following module is available by default: The following module is available by default:
\fBconfig\fR \fBconfig\fR
......
...@@ -3,7 +3,7 @@ SUBDIRS = tests ...@@ -3,7 +3,7 @@ SUBDIRS = tests
EXTRA_DIST = README logging.spec tsig_keys.spec EXTRA_DIST = README logging.spec tsig_keys.spec
datasrc.spec: datasrc.spec.pre datasrc.spec: datasrc.spec.pre
$(SED) -e "s|@@PKGDATADIR@@|$(pkgdatadir)|" datasrc.spec.pre >$@ $(SED) -e "s|@@PKGDATADIR@@|$(pkgdatadir)|;s|@@LOCALSTATEDIR@@|$(localstatedir)|" datasrc.spec.pre >$@
config_plugindir = @prefix@/share/@PACKAGE@/config_plugins config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
config_plugin_DATA = logging.spec tsig_keys.spec datasrc.spec config_plugin_DATA = logging.spec tsig_keys.spec datasrc.spec
......
...@@ -8,6 +8,14 @@ ...@@ -8,6 +8,14 @@
"item_type": "named_set", "item_type": "named_set",
"item_optional": false, "item_optional": false,
"item_default": { "item_default": {
"IN": [
{
"type": "sqlite3",
"params": {
"database_file": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
}
}
],
"CH": [ "CH": [
{ {
"type": "static", "type": "static",
......
...@@ -9,6 +9,15 @@ ...@@ -9,6 +9,15 @@
.\" .\"
.TH "B10\-CMDCTL" "8" "February 28, 2012" "BIND10" "BIND10" .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 .\" * set default formatting
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" disable hyphenation .\" disable hyphenation
......
...@@ -9,6 +9,15 @@ ...@@ -9,6 +9,15 @@
.\" .\"
.TH "B10\-RESOLVER" "8" "February 28, 2012" "BIND10" "BIND10" .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 .\" * set default formatting
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" disable hyphenation .\" disable hyphenation
......
/b10-showtech
/showtech.py
/isc-sysinfo
/sysinfo.py
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 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
b10-showtech: showtech.py isc-sysinfo: sysinfo.py
$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" showtech.py >$@ $(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" sysinfo.py >$@
chmod a+x $@ chmod a+x $@
MAN1_FILES = \ MAN1_FILES = \
b10-showtech.xml isc-sysinfo.xml
man_MANS = \ man_MANS = \
$(MAN1_FILES:.xml=.1) $(MAN1_FILES:.xml=.1)
......
'\" t '\" t
.\" Title: b10-showtech .\" Title: isc-sysinfo
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" 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 .\" Date: June 26, 2012
.\" Manual: BIND10 .\" Manual: BIND10
.\" Source: BIND10 .\" Source: BIND10
.\" Language: English .\" Language: English
.\" .\"
.TH "B10\-SHOWTECH" "1" "June 26, 2012" "BIND10" "BIND10" .TH "ISC\-SYSINFO" "1" "June 26, 2012" "BIND10" "BIND10"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
...@@ -28,14 +28,14 @@ ...@@ -28,14 +28,14 @@
.\" * MAIN CONTENT STARTS HERE * .\" * MAIN CONTENT STARTS HERE *
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.SH "NAME" .SH "NAME"
b10-showtech \- BIND 10 system information display tool isc-sysinfo \- BIND 10 system information display tool
.SH "SYNOPSIS" .SH "SYNOPSIS"
.HP \w'\fBb10\-showtech\fR\ 'u .HP \w'\fBisc\-sysinfo\fR\ 'u
\fBb10\-showtech\fR \fBisc\-sysinfo\fR
.SH "DESCRIPTION" .SH "DESCRIPTION"
.PP .PP
The 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\&. 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" .SH "ARGUMENTS"
.PP