Skip to content
GitLab
Commit 44bd04d5 authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

[master] in docs, change hardcoded package name 

from bind10-devel to bind10
parent ef190263
Hide whitespace changes
Inline Side-by-side
doc/guide/bind10-guide.xml
View file @ 44bd04d5
......@@ -503,7 +503,7 @@ var/
</listitem>
<listitem>
<simpara>
<filename>etc/bind10-devel/</filename> &mdash;
<filename>etc/bind10/</filename> &mdash;
configuration files.
</simpara>
</listitem>
......@@ -515,7 +515,7 @@ var/
</listitem>
<listitem>
<simpara>
<filename>libexec/bind10-devel/</filename> &mdash;
<filename>libexec/bind10/</filename> &mdash;
executables that a user wouldn't normally run directly and
are not run independently.
These are the BIND 10 modules which are daemons started by
......@@ -530,13 +530,13 @@ var/
</listitem>
<listitem>
<simpara>
<filename>share/bind10-devel/</filename> &mdash;
<filename>share/bind10/</filename> &mdash;
configuration specifications.
</simpara>
</listitem>
<listitem>
<simpara>
<filename>share/doc/bind10-devel/</filename> &mdash;
<filename>share/doc/bind10/</filename> &mdash;
this guide and other supplementary documentation.
</simpara>
</listitem>
......@@ -548,7 +548,7 @@ var/
</listitem>
<listitem>
<simpara>
<filename>var/bind10-devel/</filename> &mdash;
<filename>var/bind10/</filename> &mdash;
data source and configuration databases.
</simpara>
</listitem>
......@@ -910,7 +910,7 @@ as a dependency earlier -->
Administrators do not communicate directly with the
<command>b10-msgq</command> daemon.
By default, BIND 10 uses a UNIX domain socket file named
<filename>/usr/local/var/bind10-devel/msg_socket</filename>
<filename>/usr/local/var/bind10/msg_socket</filename>
for this interprocess communication.
</para>
......@@ -972,7 +972,7 @@ config changes are actually commands to cfgmgr
<!-- TODO: what about command line switch to change this? -->
<para>
The stored configuration file is at
<filename>/usr/local/var/bind10-devel/b10-config.db</filename>.
<filename>/usr/local/var/bind10/b10-config.db</filename>.
(The directory is what was defined at build configure time for
<option>--localstatedir</option>.
The default is <filename>/usr/local/var/</filename>.)
......@@ -1065,13 +1065,13 @@ but you might wanna check with likun
<para>The HTTPS server requires a private key,
such as a RSA PRIVATE KEY.
The default location is at
<filename>/usr/local/etc/bind10-devel/cmdctl-keyfile.pem</filename>.
<filename>/usr/local/etc/bind10/cmdctl-keyfile.pem</filename>.
(A sample key is at
<filename>/usr/local/share/bind10-devel/cmdctl-keyfile.pem</filename>.)
<filename>/usr/local/share/bind10/cmdctl-keyfile.pem</filename>.)
It also uses a certificate located at
<filename>/usr/local/etc/bind10-devel/cmdctl-certfile.pem</filename>.
<filename>/usr/local/etc/bind10/cmdctl-certfile.pem</filename>.
(A sample certificate is at
<filename>/usr/local/share/bind10-devel/cmdctl-certfile.pem</filename>.)
<filename>/usr/local/share/bind10/cmdctl-certfile.pem</filename>.)
This may be a self-signed certificate or purchased from a
certification authority.
</para>
......@@ -1107,11 +1107,11 @@ but that is a single file, maybe this should go back to that format?
<para>
The <command>b10-cmdctl</command> daemon also requires
the user account file located at
<filename>/usr/local/etc/bind10-devel/cmdctl-accounts.csv</filename>.
<filename>/usr/local/etc/bind10/cmdctl-accounts.csv</filename>.
This comma-delimited file lists the accounts with a user name,
hashed password, and salt.
(A sample file is at
<filename>/usr/local/share/bind10-devel/cmdctl-accounts.csv</filename>.
<filename>/usr/local/share/bind10/cmdctl-accounts.csv</filename>.
It contains the user named <quote>root</quote> with the password
<quote>bind10</quote>.)
</para>
......@@ -1141,14 +1141,14 @@ or accounts database -->
The configuration items for <command>b10-cmdctl</command> are:
<varname>accounts_file</varname> which defines the path to the
user accounts database (the default is
<filename>/usr/local/etc/bind10-devel/cmdctl-accounts.csv</filename>);
<filename>/usr/local/etc/bind10/cmdctl-accounts.csv</filename>);
<varname>cert_file</varname> which defines the path to the
PEM certificate file (the default is
<filename>/usr/local/etc/bind10-devel/cmdctl-certfile.pem</filename>);
<filename>/usr/local/etc/bind10/cmdctl-certfile.pem</filename>);
and
<varname>key_file</varname> which defines the path to the
PEM private key file (the default is
<filename>/usr/local/etc/bind10-devel/cmdctl-keyfile.pem</filename>).
<filename>/usr/local/etc/bind10/cmdctl-keyfile.pem</filename>).
</para>
</section>
......@@ -2459,7 +2459,7 @@ can use various data source backends.
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/zone.sqlite3</filename>.
</para>
<para>
......@@ -3673,7 +3673,7 @@ mysql></screen>
<para>
3. Create the database tables:
<screen>mysql> <userinput>CONNECT kea;</userinput>
mysql> <userinput>SOURCE <replaceable>&lt;path-to-bind10&gt;</replaceable>/share/bind10-devel/dhcpdb_create.mysql</userinput></screen>
mysql> <userinput>SOURCE <replaceable>&lt;path-to-bind10&gt;</replaceable>/share/bind10/dhcpdb_create.mysql</userinput></screen>
</para>
<para>
4. Create the user under which BIND 10 will access the database and grant it access to the database tables:
......
src/bin/auth/b10-auth.xml
View file @ 44bd04d5
......@@ -100,7 +100,7 @@
<varname>database_file</varname> defines the path to the
SQLite3 zone file when using the sqlite datasource.
The default is
<filename>/usr/local/var/bind10-devel/zone.sqlite3</filename>.
<filename>/usr/local/var/bind10/zone.sqlite3</filename>.
</para>
<para>
......@@ -255,7 +255,7 @@
<refsect1>
<title>FILES</title>
<para>
<filename>/usr/local/var/bind10-devel/zone.sqlite3</filename>
<filename>/usr/local/var/bind10/zone.sqlite3</filename>
&mdash; Location for the SQLite3 zone database
when <emphasis>database_file</emphasis> configuration is not
defined.
......
src/bin/bind10/bind10.xml
View file @ 44bd04d5
......@@ -160,7 +160,7 @@
<citerefentry><refentrytitle>b10-msgq</refentrytitle><manvolnum>8</manvolnum></citerefentry>
daemon to use.
The default is
<filename>/usr/local/var/bind10-devel/msg_socket</filename>.
<filename>/usr/local/var/bind10/msg_socket</filename>.
<!-- @localstatedir@/@PACKAGE_NAME@/msg_socket -->
</para>
</listitem>
......
src/bin/cfgmgr/b10-cfgmgr.xml
View file @ 44bd04d5
......@@ -136,7 +136,7 @@
<refsect1>
<title>FILES</title>
<!-- TODO: fix path -->
<para><filename>/usr/local/var/bind10-devel/b10-config.db</filename>
<para><filename>/usr/local/var/bind10/b10-config.db</filename>
&mdash; Configuration storage file.
</para>
</refsect1>
......
src/bin/cmdctl/b10-certgen.xml
View file @ 44bd04d5
......@@ -190,7 +190,7 @@
To update an expired certificate in BIND 10 that has been installed to
/usr/local:
<screen>
$> cd /usr/local/etc/bind10-devel/
$> cd /usr/local/etc/bind10/
$> b10-certgen
cmdctl-certfile.pem failed to verify: certificate has expired
......
src/bin/cmdctl/b10-cmdctl.xml
View file @ 44bd04d5
......@@ -147,21 +147,21 @@
<varname>accounts_file</varname> defines the path to the
user accounts database.
The default is
<filename>/usr/local/etc/bind10-devel/cmdctl-accounts.csv</filename>.
<filename>/usr/local/etc/bind10/cmdctl-accounts.csv</filename>.
</para>
<para>
<varname>cert_file</varname> defines the path to the
PEM certificate file.
The default is
<filename>/usr/local/etc/bind10-devel/cmdctl-certfile.pem</filename>.
<filename>/usr/local/etc/bind10/cmdctl-certfile.pem</filename>.
</para>
<para>
<varname>key_file</varname> defines the path to the PEM private key
file.
The default is
<filename>/usr/local/etc/bind10-devel/cmdctl-keyfile.pem</filename>.
<filename>/usr/local/etc/bind10/cmdctl-keyfile.pem</filename>.
</para>
<!-- TODO: formating -->
......@@ -187,17 +187,17 @@
<!-- TODO: permissions -->
<!-- TODO: what about multiple accounts? -->
<!-- TODO: shouldn't the password file name say cmdctl in it? -->
<para><filename>/usr/local/etc/bind10-devel/cmdctl-accounts.csv</filename>
<para><filename>/usr/local/etc/bind10/cmdctl-accounts.csv</filename>
&mdash; account database containing the name, hashed password,
and the salt.
</para>
<!-- TODO: replace /usr/local -->
<!-- TODO: permissions -->
<!-- TODO: shouldn't have both in same file, will be configurable -->
<para><filename>/usr/local/etc/bind10-devel/cmdctl-keyfile.pem</filename>
<para><filename>/usr/local/etc/bind10/cmdctl-keyfile.pem</filename>
&mdash; contains the Private key.
</para>
<para><filename>/usr/local/etc/bind10-devel/cmdctl-certfile.pem</filename>
<para><filename>/usr/local/etc/bind10/cmdctl-certfile.pem</filename>
&mdash; contains the Certificate.
</para>
</refsect1>
......
src/bin/msgq/msgq.xml
View file @ 44bd04d5
......@@ -111,7 +111,7 @@
<listitem><para>
The UNIX domain socket file this daemon will use.
The default is
<filename>/usr/local/var/bind10-devel/msg_socket</filename>.
<filename>/usr/local/var/bind10/msg_socket</filename>.
<!-- @localstatedir@/@PACKAGE_NAME@/msg_socket -->
</para></listitem>
</varlistentry>
......
src/bin/stats/b10-stats-httpd.xml
View file @ 44bd04d5
......@@ -103,7 +103,7 @@
<refsect1>
<title>FILES</title>
<para>
<filename>/usr/local/share/bind10-devel/stats-httpd.spec</filename>
<filename>/usr/local/share/bind10/stats-httpd.spec</filename>
<!--TODO: The filename should be computed from prefix-->
&mdash; the spec file of <command>b10-stats-httpd</command>. This file
contains configurable settings
......@@ -115,17 +115,17 @@
how to configure the settings.
</para>
<para>
<filename>/usr/local/share/bind10-devel/stats-httpd-xml.tpl</filename>
<filename>/usr/local/share/bind10/stats-httpd-xml.tpl</filename>
<!--TODO: The filename should be computed from prefix-->
&mdash; the template file of XML document.
</para>
<para>
<filename>/usr/local/share/bind10-devel/stats-httpd-xsd.tpl</filename>
<filename>/usr/local/share/bind10/stats-httpd-xsd.tpl</filename>
<!--TODO: The filename should be computed from prefix-->
&mdash; the template file of XSD document.
</para>
<para>
<filename>/usr/local/share/bind10-devel/stats-httpd-xsl.tpl</filename>
<filename>/usr/local/share/bind10/stats-httpd-xsl.tpl</filename>
<!--TODO: The filename should be computed from prefix-->
&mdash; the template file of XSL document.
</para>
......
src/bin/stats/b10-stats.xml
View file @ 44bd04d5
......@@ -210,7 +210,7 @@
<refsect1>
<title>FILES</title>
<para><filename>/usr/local/share/bind10-devel/stats.spec</filename>
<para><filename>/usr/local/share/bind10/stats.spec</filename>
<!--TODO: The filename should be computed from prefix-->
&mdash; This is a spec file for <command>b10-stats</command>. It
contains commands for <command>b10-stats</command>. They can be
......
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