BIND 10 master, updated. dc26ce9dfdb9ea97e0a4f74485d6d6d9af0835da [master] update changelog for merge of 2126
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Aug 6 07:49:55 UTC 2012
The branch, master has been updated
via dc26ce9dfdb9ea97e0a4f74485d6d6d9af0835da (commit)
via 1ecb73e5bf38c5dc4efad44aac0331e487829d89 (commit)
via bb1471521f157d034bec34150d19698f3fa44d8f (commit)
via 2ec3c8fcef449c8959fb0fb020ac58cfc00bbfd0 (commit)
from a77342a649b33001245341f2e6a038a7fc7673d6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit dc26ce9dfdb9ea97e0a4f74485d6d6d9af0835da
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Aug 6 09:49:13 2012 +0200
[master] update changelog for merge of 2126
since the b10-showtech had not been released yet, I just replaced its name in the existing changelog entry
commit 1ecb73e5bf38c5dc4efad44aac0331e487829d89
Merge: a77342a bb14715
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Aug 6 09:32:06 2012 +0200
[master] Merge branch 'trac2126'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 +-
configure.ac | 4 ++--
doc/guide/bind10-messages.html | 2 +-
src/bin/Makefile.am | 2 +-
src/bin/bindctl/bindctl.1 | 17 +++++++++++++----
src/bin/cmdctl/b10-cmdctl.8 | 9 +++++++++
src/bin/resolver/b10-resolver.8 | 9 +++++++++
src/bin/showtech/.gitignore | 2 --
src/bin/sysinfo/.gitignore | 2 ++
src/bin/{showtech => sysinfo}/Makefile.am | 10 +++++-----
.../b10-showtech.1 => sysinfo/isc-sysinfo.1} | 18 +++++++++---------
.../b10-showtech.xml => sysinfo/isc-sysinfo.xml} | 12 ++++++------
.../showtech.py.in => sysinfo/sysinfo.py.in} | 2 +-
src/bin/zonemgr/b10-zonemgr.8 | 11 ++++++++++-
14 files changed, 69 insertions(+), 33 deletions(-)
delete mode 100644 src/bin/showtech/.gitignore
create mode 100644 src/bin/sysinfo/.gitignore
rename src/bin/{showtech => sysinfo}/Makefile.am (70%)
rename src/bin/{showtech/b10-showtech.1 => sysinfo/isc-sysinfo.1} (84%)
rename src/bin/{showtech/b10-showtech.xml => sysinfo/isc-sysinfo.xml} (89%)
rename src/bin/{showtech/showtech.py.in => sysinfo/sysinfo.py.in} (99%)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 8107f0d..7716b44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,7 +45,7 @@
(Trac #1986, git bd6b0a5ed3481f78fb4e5cb0b18c7b6e5920f9f8)
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
can be used by future tech support staff.
(Trac #2062, git 144e80212746f8d55e6a59edcf689fec9f32ae95)
diff --git a/configure.ac b/configure.ac
index abc4e88..e75cbd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/doc/guide/bind10-messages.html b/doc/guide/bind10-messages.html
index cfa27a6..37c742b 100644
--- a/doc/guide/bind10-messages.html
+++ b/doc/guide/bind10-messages.html
@@ -1,4 +1,4 @@
-<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
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index c821b9f..7af44f9 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,5 +1,5 @@
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
diff --git a/src/bin/bindctl/bindctl.1 b/src/bin/bindctl/bindctl.1
index 6aee29c..dc20e61 100644
--- a/src/bin/bindctl/bindctl.1
+++ b/src/bin/bindctl/bindctl.1
@@ -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
diff --git a/src/bin/cmdctl/b10-cmdctl.8 b/src/bin/cmdctl/b10-cmdctl.8
index 0b478fe..ab3ec61 100644
--- a/src/bin/cmdctl/b10-cmdctl.8
+++ b/src/bin/cmdctl/b10-cmdctl.8
@@ -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
diff --git a/src/bin/resolver/b10-resolver.8 b/src/bin/resolver/b10-resolver.8
index eed69b8..34eb610 100644
--- a/src/bin/resolver/b10-resolver.8
+++ b/src/bin/resolver/b10-resolver.8
@@ -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
diff --git a/src/bin/showtech/.gitignore b/src/bin/showtech/.gitignore
deleted file mode 100644
index f3d5873..0000000
--- a/src/bin/showtech/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/b10-showtech
-/showtech.py
diff --git a/src/bin/showtech/Makefile.am b/src/bin/showtech/Makefile.am
deleted file mode 100644
index cc9923c..0000000
--- a/src/bin/showtech/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-bin_SCRIPTS = b10-showtech
-
-CLEANFILES = b10-showtech showtech.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 >$@
- chmod a+x $@
-
-MAN1_FILES = \
- b10-showtech.xml
-
-man_MANS = \
- $(MAN1_FILES:.xml=.1)
-
-if ENABLE_MAN
-
-.xml.1:
- xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-endif
-
-EXTRA_DIST = $(man_MANS) $(MAN1_FILES)
-
-CLEANDIRS = __pycache__
-
-clean-local:
- rm -rf $(CLEANDIRS)
diff --git a/src/bin/showtech/b10-showtech.1 b/src/bin/showtech/b10-showtech.1
deleted file mode 100644
index b331713..0000000
--- a/src/bin/showtech/b10-showtech.1
+++ /dev/null
@@ -1,66 +0,0 @@
-'\" t
-.\" Title: b10-showtech
-.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: June 26, 2012
-.\" Manual: BIND10
-.\" Source: BIND10
-.\" Language: English
-.\"
-.TH "B10\-SHOWTECH" "1" "June 26, 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
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-b10-showtech \- BIND 10 system information display tool
-.SH "SYNOPSIS"
-.HP \w'\fBb10\-showtech\fR\ 'u
-\fBb10\-showtech\fR
-.SH "DESCRIPTION"
-.PP
-The
-\fBb10\-showtech\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
-\-h
-.RS 4
-Displays usage instructions\&.
-.RE
-.PP
-\-o \fIoutput\-file\fR
-.RS 4
-If an output file is specified, the output of
-\fBb10\-showtech\fR
-is written to this file\&. By default, the output is written to standard output\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBbind10\fR(8),
-BIND 10 Guide\&.
-.SH "HISTORY"
-.PP
-The
-\fBb10\-showtech\fR
-daemon was initially implemented by ISC staff in June, 2012\&.
-.SH "COPYRIGHT"
-.br
-Copyright \(co 2012 Internet Systems Consortium, Inc. ("ISC")
-.br
diff --git a/src/bin/showtech/b10-showtech.xml b/src/bin/showtech/b10-showtech.xml
deleted file mode 100644
index fe11ed1..0000000
--- a/src/bin/showtech/b10-showtech.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
- [<!ENTITY mdash "—">]>
-<!--
- - Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
- -
- - Permission to use, copy, modify, and/or distribute this software for any
- - purpose with or without fee is hereby granted, provided that the above
- - copyright notice and this permission notice appear in all copies.
- -
- - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- - PERFORMANCE OF THIS SOFTWARE.
--->
-
-<refentry>
-
- <refentryinfo>
- <date>June 26, 2012</date>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>b10-showtech</refentrytitle>
- <manvolnum>1</manvolnum>
- <refmiscinfo>BIND10</refmiscinfo>
- </refmeta>
-
- <refnamediv>
- <refname>b10-showtech</refname>
- <refpurpose>BIND 10 system information display tool</refpurpose>
- </refnamediv>
-
- <docinfo>
- <copyright>
- <year>2012</year>
- <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
- </copyright>
- </docinfo>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>b10-showtech</command>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- The <command>b10-showtech</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.
- </para>
- </refsect1>
-
- <refsect1>
- <title>ARGUMENTS</title>
-
- <variablelist>
-
- <varlistentry>
- <term>-h</term>
- <listitem><para>
- Displays usage instructions.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <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
- default, the output is written to standard output.
- </para></listitem>
- </varlistentry>
-
- </variablelist>
-
- </refsect1>
-
- <refsect1>
- <title>SEE ALSO</title>
- <para>
- <citerefentry>
- <refentrytitle>bind10</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>,
- <citetitle>BIND 10 Guide</citetitle>.
- </para>
- </refsect1>
-
- <refsect1>
- <title>HISTORY</title>
- <para>
- The <command>b10-showtech</command> daemon was initially
- implemented by ISC staff in June, 2012.
- </para>
- </refsect1>
-</refentry><!--
- - Local variables:
- - mode: sgml
- - End:
--->
diff --git a/src/bin/showtech/showtech.py.in b/src/bin/showtech/showtech.py.in
deleted file mode 100755
index 5b67847..0000000
--- a/src/bin/showtech/showtech.py.in
+++ /dev/null
@@ -1,127 +0,0 @@
-#!@PYTHON@
-
-# Copyright (C) 2012 Internet Systems Consortium.
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
-# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
-# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""
-BIND 10 showtech program.
-
-"""
-
-import sys; sys.path.append ('@@PYTHONPATH@@')
-import getopt
-import isc.util.process
-from isc.sysinfo import *
-
-isc.util.process.rename()
-
-def usage():
- print("Usage: %s [-h] [-o <output-file>]" % sys.argv[0], \
- file=sys.stderr)
- exit(1)
-
-def main():
- try:
- opts, args = getopt.getopt(sys.argv[1:], "o:h", \
- ["output", "help"])
- except getopt.GetoptError as e:
- print(str(e))
- usage()
- exit(1)
-
- output_filename = None
- for option, arg in opts:
- if option in ("-o", "--output"):
- output_filename = arg
- elif option in ("-h", "--help"):
- usage()
- else:
- assert False, "unhandled option"
-
- if output_filename is None:
- f = sys.stdout
- else:
- f = open(output_filename, 'w')
-
- s = SysInfoFromFactory()
-
- f.write('BIND 10 ShowTech tool\n')
- f.write('=====================\n')
-
- f.write('\nCPU\n');
- f.write(' + Number of processors: %d\n' % (s.get_num_processors()))
- f.write(' + Endianness: %s\n' % (s.get_endianness()))
-
- f.write('\nPlatform\n');
- f.write(' + Operating system: %s\n' % (s.get_platform_name()))
- f.write(' + Distribution: %s\n' % (s.get_platform_distro()))
- f.write(' + Kernel version: %s\n' % (s.get_platform_version()))
-
- f.write(' + SMP kernel: ')
- if s.get_platform_is_smp():
- f.write('yes')
- else:
- f.write('no')
- f.write('\n')
-
- f.write(' + Machine name: %s\n' % (s.get_platform_machine()))
- f.write(' + Hostname: %s\n' % (s.get_platform_hostname()))
- f.write(' + Uptime: %d seconds\n' % (s.get_uptime()))
-
- l = s.get_loadavg()
- f.write(' + Loadavg: %f %f %f\n' % (l[0], l[1], l[2]))
-
- f.write('\nMemory\n');
- f.write(' + Total: %d bytes\n' % (s.get_mem_total()))
- f.write(' + Free: %d bytes\n' % (s.get_mem_free()))
- f.write(' + Cached: %d bytes\n' % (s.get_mem_cached()))
- f.write(' + Buffers: %d bytes\n' % (s.get_mem_buffers()))
- f.write(' + Swap total: %d bytes\n' % (s.get_mem_swap_total()))
- f.write(' + Swap free: %d bytes\n' % (s.get_mem_swap_free()))
-
- f.write('\n\nNetwork\n');
- f.write('-------\n\n');
-
- f.write('Interfaces\n')
- f.write('~~~~~~~~~~\n\n')
-
- f.write(s.get_net_interfaces())
-
- f.write('\nRouting table\n')
- f.write('~~~~~~~~~~~~~\n\n')
- f.write(s.get_net_routing_table())
-
- f.write('\nStatistics\n')
- f.write('~~~~~~~~~~\n\n')
- f.write(s.get_net_stats())
-
- f.write('\nConnections\n')
- f.write('~~~~~~~~~~~\n\n')
- f.write(s.get_net_connections())
-
- try:
- if os.getuid() != 0:
- sys.stderr.write('\n')
- sys.stderr.write('NOTE: You have to run this program as the root user so that it can\n')
- sys.stderr.write(' collect all the information it requires. Some information is\n')
- sys.stderr.write(' only available to the root user.\n\n')
- except Exception:
- pass
-
- if f != sys.stdout:
- f.close()
-
-if __name__ == '__main__':
- main()
diff --git a/src/bin/sysinfo/.gitignore b/src/bin/sysinfo/.gitignore
new file mode 100644
index 0000000..7a91274
--- /dev/null
+++ b/src/bin/sysinfo/.gitignore
@@ -0,0 +1,2 @@
+/isc-sysinfo
+/sysinfo.py
diff --git a/src/bin/sysinfo/Makefile.am b/src/bin/sysinfo/Makefile.am
new file mode 100644
index 0000000..8023f51
--- /dev/null
+++ b/src/bin/sysinfo/Makefile.am
@@ -0,0 +1,28 @@
+bin_SCRIPTS = isc-sysinfo
+
+CLEANFILES = isc-sysinfo sysinfo.pyc
+
+# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
+isc-sysinfo: sysinfo.py
+ $(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" sysinfo.py >$@
+ chmod a+x $@
+
+MAN1_FILES = \
+ isc-sysinfo.xml
+
+man_MANS = \
+ $(MAN1_FILES:.xml=.1)
+
+if ENABLE_MAN
+
+.xml.1:
+ xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+endif
+
+EXTRA_DIST = $(man_MANS) $(MAN1_FILES)
+
+CLEANDIRS = __pycache__
+
+clean-local:
+ rm -rf $(CLEANDIRS)
diff --git a/src/bin/sysinfo/isc-sysinfo.1 b/src/bin/sysinfo/isc-sysinfo.1
new file mode 100644
index 0000000..e923fdd
--- /dev/null
+++ b/src/bin/sysinfo/isc-sysinfo.1
@@ -0,0 +1,66 @@
+'\" t
+.\" Title: isc-sysinfo
+.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\" Date: June 26, 2012
+.\" Manual: BIND10
+.\" Source: BIND10
+.\" Language: English
+.\"
+.TH "ISC\-SYSINFO" "1" "June 26, 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
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+isc-sysinfo \- BIND 10 system information display tool
+.SH "SYNOPSIS"
+.HP \w'\fBisc\-sysinfo\fR\ 'u
+\fBisc\-sysinfo\fR
+.SH "DESCRIPTION"
+.PP
+The
+\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
+\-h
+.RS 4
+Displays usage instructions\&.
+.RE
+.PP
+\-o \fIoutput\-file\fR
+.RS 4
+If an output file is specified, the output of
+\fBisc\-sysinfo\fR
+is written to this file\&. By default, the output is written to standard output\&.
+.RE
+.SH "SEE ALSO"
+.PP
+
+\fBbind10\fR(8),
+BIND 10 Guide\&.
+.SH "HISTORY"
+.PP
+The
+\fBisc\-sysinfo\fR
+daemon was initially implemented by ISC staff in June, 2012\&.
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2012 Internet Systems Consortium, Inc. ("ISC")
+.br
diff --git a/src/bin/sysinfo/isc-sysinfo.xml b/src/bin/sysinfo/isc-sysinfo.xml
new file mode 100644
index 0000000..919ed83
--- /dev/null
+++ b/src/bin/sysinfo/isc-sysinfo.xml
@@ -0,0 +1,106 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+ [<!ENTITY mdash "—">]>
+<!--
+ - Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
+ -
+ - Permission to use, copy, modify, and/or distribute this software for any
+ - purpose with or without fee is hereby granted, provided that the above
+ - copyright notice and this permission notice appear in all copies.
+ -
+ - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ - PERFORMANCE OF THIS SOFTWARE.
+-->
+
+<refentry>
+
+ <refentryinfo>
+ <date>June 26, 2012</date>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>isc-sysinfo</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo>BIND10</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>isc-sysinfo</refname>
+ <refpurpose>BIND 10 system information display tool</refpurpose>
+ </refnamediv>
+
+ <docinfo>
+ <copyright>
+ <year>2012</year>
+ <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
+ </copyright>
+ </docinfo>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>isc-sysinfo</command>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ 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.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>ARGUMENTS</title>
+
+ <variablelist>
+
+ <varlistentry>
+ <term>-h</term>
+ <listitem><para>
+ Displays usage instructions.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-o <replaceable class="parameter">output-file</replaceable></term>
+ <listitem><para>
+ If an output file is specified, the output
+ of <command>isc-sysinfo</command> is written to this file. By
+ default, the output is written to standard output.
+ </para></listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry>
+ <refentrytitle>bind10</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry>,
+ <citetitle>BIND 10 Guide</citetitle>.
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title>HISTORY</title>
+ <para>
+ The <command>isc-sysinfo</command> daemon was initially
+ implemented by ISC staff in June, 2012.
+ </para>
+ </refsect1>
+</refentry><!--
+ - Local variables:
+ - mode: sgml
+ - End:
+-->
diff --git a/src/bin/sysinfo/sysinfo.py.in b/src/bin/sysinfo/sysinfo.py.in
new file mode 100755
index 0000000..1e77acb
--- /dev/null
+++ b/src/bin/sysinfo/sysinfo.py.in
@@ -0,0 +1,127 @@
+#!@PYTHON@
+
+# Copyright (C) 2012 Internet Systems Consortium.
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
+# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+"""
+ISC sysinfo program.
+
+"""
+
+import sys; sys.path.append ('@@PYTHONPATH@@')
+import getopt
+import isc.util.process
+from isc.sysinfo import *
+
+isc.util.process.rename()
+
+def usage():
+ print("Usage: %s [-h] [-o <output-file>]" % sys.argv[0], \
+ file=sys.stderr)
+ exit(1)
+
+def main():
+ try:
+ opts, args = getopt.getopt(sys.argv[1:], "o:h", \
+ ["output", "help"])
+ except getopt.GetoptError as e:
+ print(str(e))
+ usage()
+ exit(1)
+
+ output_filename = None
+ for option, arg in opts:
+ if option in ("-o", "--output"):
+ output_filename = arg
+ elif option in ("-h", "--help"):
+ usage()
+ else:
+ assert False, "unhandled option"
+
+ if output_filename is None:
+ f = sys.stdout
+ else:
+ f = open(output_filename, 'w')
+
+ s = SysInfoFromFactory()
+
+ f.write('BIND 10 ShowTech tool\n')
+ f.write('=====================\n')
+
+ f.write('\nCPU\n');
+ f.write(' + Number of processors: %d\n' % (s.get_num_processors()))
+ f.write(' + Endianness: %s\n' % (s.get_endianness()))
+
+ f.write('\nPlatform\n');
+ f.write(' + Operating system: %s\n' % (s.get_platform_name()))
+ f.write(' + Distribution: %s\n' % (s.get_platform_distro()))
+ f.write(' + Kernel version: %s\n' % (s.get_platform_version()))
+
+ f.write(' + SMP kernel: ')
+ if s.get_platform_is_smp():
+ f.write('yes')
+ else:
+ f.write('no')
+ f.write('\n')
+
+ f.write(' + Machine name: %s\n' % (s.get_platform_machine()))
+ f.write(' + Hostname: %s\n' % (s.get_platform_hostname()))
+ f.write(' + Uptime: %d seconds\n' % (s.get_uptime()))
+
+ l = s.get_loadavg()
+ f.write(' + Loadavg: %f %f %f\n' % (l[0], l[1], l[2]))
+
+ f.write('\nMemory\n');
+ f.write(' + Total: %d bytes\n' % (s.get_mem_total()))
+ f.write(' + Free: %d bytes\n' % (s.get_mem_free()))
+ f.write(' + Cached: %d bytes\n' % (s.get_mem_cached()))
+ f.write(' + Buffers: %d bytes\n' % (s.get_mem_buffers()))
+ f.write(' + Swap total: %d bytes\n' % (s.get_mem_swap_total()))
+ f.write(' + Swap free: %d bytes\n' % (s.get_mem_swap_free()))
+
+ f.write('\n\nNetwork\n');
+ f.write('-------\n\n');
+
+ f.write('Interfaces\n')
+ f.write('~~~~~~~~~~\n\n')
+
+ f.write(s.get_net_interfaces())
+
+ f.write('\nRouting table\n')
+ f.write('~~~~~~~~~~~~~\n\n')
+ f.write(s.get_net_routing_table())
+
+ f.write('\nStatistics\n')
+ f.write('~~~~~~~~~~\n\n')
+ f.write(s.get_net_stats())
+
+ f.write('\nConnections\n')
+ f.write('~~~~~~~~~~~\n\n')
+ f.write(s.get_net_connections())
+
+ try:
+ if os.getuid() != 0:
+ sys.stderr.write('\n')
+ sys.stderr.write('NOTE: You have to run this program as the root user so that it can\n')
+ sys.stderr.write(' collect all the information it requires. Some information is\n')
+ sys.stderr.write(' only available to the root user.\n\n')
+ except Exception:
+ pass
+
+ if f != sys.stdout:
+ f.close()
+
+if __name__ == '__main__':
+ main()
diff --git a/src/bin/zonemgr/b10-zonemgr.8 b/src/bin/zonemgr/b10-zonemgr.8
index 1bce2af..99bd8ea 100644
--- a/src/bin/zonemgr/b10-zonemgr.8
+++ b/src/bin/zonemgr/b10-zonemgr.8
@@ -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
More information about the bind10-changes
mailing list