Unbreak build and whitespace clean-up.

This commit is contained in:
Hiroki Sato 2009-05-17 09:42:35 +00:00
parent 06864915c7
commit 79436d4ede
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=34283

View file

@ -3218,6 +3218,7 @@ dhcpd_ifaces="dc0"</programlisting>
<sect2> <sect2>
<title>Starting BIND</title> <title>Starting BIND</title>
<indexterm> <indexterm>
<primary>BIND</primary> <primary>BIND</primary>
<secondary>starting</secondary> <secondary>starting</secondary>
@ -3254,6 +3255,7 @@ dhcpd_ifaces="dc0"</programlisting>
<sect2> <sect2>
<title>Configuration Files</title> <title>Configuration Files</title>
<indexterm> <indexterm>
<primary>BIND</primary> <primary>BIND</primary>
<secondary>configuration files</secondary> <secondary>configuration files</secondary>
@ -3322,8 +3324,7 @@ options {
// the entries in /etc/resolv.conf, uncomment the following line and // the entries in /etc/resolv.conf, uncomment the following line and
// set named_auto_forward=yes in /etc/rc.conf. You can also enable // set named_auto_forward=yes in /etc/rc.conf. You can also enable
// named_auto_forward_only (the effect of which is described above). // named_auto_forward_only (the effect of which is described above).
// include "/etc/namedb/auto_forward.conf"; // include "/etc/namedb/auto_forward.conf";</programlisting>
</programlisting>
<para>Just as the comment says, to benefit from an uplink's <para>Just as the comment says, to benefit from an uplink's
cache, <literal>forwarders</literal> can be enabled here. cache, <literal>forwarders</literal> can be enabled here.
@ -3607,7 +3608,7 @@ zone "1.168.192.in-addr.arpa" {
<primary>BIND</primary> <primary>BIND</primary>
<secondary>zone files</secondary> <secondary>zone files</secondary>
</indexterm> </indexterm>
<para>An example master zone file for <hostid <para>An example master zone file for <hostid
role="domainname">example.org</hostid> (existing within role="domainname">example.org</hostid> (existing within
<filename>/etc/namedb/master/example.org</filename>) is as <filename>/etc/namedb/master/example.org</filename>) is as
@ -3640,28 +3641,24 @@ mx IN A 192.168.1.4
mail IN A 192.168.1.5 mail IN A 192.168.1.5
; Aliases ; Aliases
www IN CNAME example.org.<programlisting> www IN CNAME example.org.</programlisting>
<para> <para>Note that every hostname ending in a <quote>.</quote> is an
Note that every hostname ending in a <quote>.</quote> is an
exact hostname, whereas everything without a trailing exact hostname, whereas everything without a trailing
<quote>.</quote> is relative to the origin. For example, <quote>.</quote> is relative to the origin. For example,
<literal>ns1</literal> is translated into <literal>ns1</literal> is translated into
<literal>ns1.<replaceable>example.org.</replaceable></literal> <literal>ns1.<replaceable>example.org.</replaceable></literal></para>
</para>
<para>The format of a zone file follows:</para>
<para>
The format of a zone file follows:
</para>
<programlisting>recordname IN recordtype value</programlisting> <programlisting>recordname IN recordtype value</programlisting>
<indexterm> <indexterm>
<primary>DNS</primary> <primary>DNS</primary>
<secondary>records</secondary> <secondary>records</secondary>
</indexterm> </indexterm>
<para>
The most commonly used DNS records: <para>The most commonly used DNS records:</para>
</para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
@ -3702,8 +3699,7 @@ www IN CNAME example.org.<programlisting>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
<programlisting> <programlisting>example.org. IN SOA ns1.example.org. admin.example.org. (
example.org. IN SOA ns1.example.org. admin.example.org. (
2006051501 ; Serial 2006051501 ; Serial
10800 ; Refresh after 3 hours 10800 ; Refresh after 3 hours
3600 ; Retry after 1 hour 3600 ; Retry after 1 hour
@ -3714,23 +3710,28 @@ example.org. IN SOA ns1.example.org. admin.example.org. (
<varlistentry> <varlistentry>
<term><hostid role="domainname">example.org.</hostid></term> <term><hostid role="domainname">example.org.</hostid></term>
<listitem><para>the domain name, also the origin for this <listitem>
zone file.</para></listitem> <para>the domain name, also the origin for this
zone file.</para>
</listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><hostid role="fqdn">ns1.example.org.</hostid></term> <term><hostid role="fqdn">ns1.example.org.</hostid></term>
<listitem><para>the primary/authoritative name server for this <listitem>
zone.</para></listitem> <para>the primary/authoritative name server for this
zone.</para>
</listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><literal>admin.example.org.</literal></term> <term><literal>admin.example.org.</literal></term>
<listitem><para>the responsible person for this zone, <listitem>
<para>the responsible person for this zone,
email address with <quote>@</quote> email address with <quote>@</quote>
replaced. (<email>admin@example.org</email> becomes replaced. (<email>admin@example.org</email> becomes
<literal>admin.example.org</literal>)</para> <literal>admin.example.org</literal>)</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -3738,91 +3739,75 @@ example.org. IN SOA ns1.example.org. admin.example.org. (
<varlistentry> <varlistentry>
<term><literal>2006051501</literal></term> <term><literal>2006051501</literal></term>
<listitem><para>the serial number of the file. This <listitem>
must be incremented each time the zone file is <para>the serial number of the file. This
modified. Nowadays, many admins prefer a must be incremented each time the zone file is
<literal>yyyymmddrr</literal> format for the serial modified. Nowadays, many admins prefer a
number. <literal>2006051501</literal> would mean <literal>yyyymmddrr</literal> format for the serial
last modified 05/15/2006, the latter number. <literal>2006051501</literal> would mean
<literal>01</literal> being the first time the zone last modified 05/15/2006, the latter
file has been modified this day. The serial number <literal>01</literal> being the first time the zone
is important as it alerts slave name servers for a file has been modified this day. The serial number
zone when it is updated.</para> is important as it alerts slave name servers for a
</listitem> zone when it is updated.</para>
</listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>
<programlisting> <programlisting> IN NS ns1.example.org.</programlisting>
IN NS ns1.example.org.</programlisting>
<para> <para>This is an NS entry. Every name server that is going to reply
This is an NS entry. Every name server that is going to reply authoritatively for the zone must have one of these entries.</para>
authoritatively for the zone must have one of these entries.
</para>
<programlisting> <programlisting>localhost IN A 127.0.0.1
localhost IN A 127.0.0.1
ns1 IN A 192.168.1.2 ns1 IN A 192.168.1.2
ns2 IN A 192.168.1.3 ns2 IN A 192.168.1.3
mx IN A 192.168.1.4 mx IN A 192.168.1.4
mail IN A 192.168.1.5</programlisting> mail IN A 192.168.1.5</programlisting>
<para> <para>The A record indicates machine names. As seen above,
The A record indicates machine names. As seen above,
<hostid role="fqdn">ns1.example.org</hostid> would resolve <hostid role="fqdn">ns1.example.org</hostid> would resolve
to <hostid role="ipaddr">192.168.1.2</hostid>. to <hostid role="ipaddr">192.168.1.2</hostid>.</para>
</para>
<programlisting> <programlisting> IN A 192.168.1.1</programlisting>
IN A 192.168.1.1</programlisting>
<para>This line assigns IP address <para>This line assigns IP address
<hostid role="ipaddr">192.168.1.1</hostid> to the current origin, <hostid role="ipaddr">192.168.1.1</hostid> to the current origin,
in this case <hostid role="domainname">example.org</hostid>.</para> in this case <hostid role="domainname">example.org</hostid>.</para>
<programlisting> <programlisting>www IN CNAME @</programlisting>
www IN CNAME @</programlisting>
<para> <para>The canonical name record is usually used for giving aliases
The canonical name record is usually used for giving aliases
to a machine. In the example, <hostid>www</hostid> is to a machine. In the example, <hostid>www</hostid> is
aliased to the <quote>master</quote> machine whose name happens aliased to the <quote>master</quote> machine whose name happens
to be the same as the domain name to be the same as the domain name
<hostid role="domainname">example.org</hostid> <hostid role="domainname">example.org</hostid>
(<hostid role="ipaddr">192.168.1.1</hostid>). (<hostid role="ipaddr">192.168.1.1</hostid>).
CNAMEs can never be used together with another kind of record CNAMEs can never be used together with another kind of record
for the same hostname. for the same hostname.</para>
</para>
<indexterm> <indexterm>
<primary>MX record</primary> <primary>MX record</primary>
</indexterm> </indexterm>
<programlisting> <programlisting> IN MX 10 mail.example.org.</programlisting>
IN MX 10 mail.example.org.</programlisting>
<para> <para>The MX record indicates which mail
The MX record indicates which mail
servers are responsible for handling incoming mail for the servers are responsible for handling incoming mail for the
zone. <hostid role="fqdn">mail.example.org</hostid> is the zone. <hostid role="fqdn">mail.example.org</hostid> is the
hostname of the mail server, and 10 being the priority of hostname of the mail server, and 10 being the priority of
that mail server. that mail server.</para>
</para>
<para> <para>One can have several mail servers, with priorities of 10,
One can have several mail servers, with priorities of 10,
20 and so on. A mail server attempting to deliver to <hostid 20 and so on. A mail server attempting to deliver to <hostid
role="domainname">example.org</hostid> would first try the role="domainname">example.org</hostid> would first try the
highest priority MX (the record with the lowest priority highest priority MX (the record with the lowest priority
number), then the second highest, etc, until the mail can be number), then the second highest, etc, until the mail can be
properly delivered. properly delivered.</para>
</para>
<para> <para>For in-addr.arpa zone files (reverse DNS), the same format is
For in-addr.arpa zone files (reverse DNS), the same format is
used, except with PTR entries instead of used, except with PTR entries instead of
A or CNAME. A or CNAME.</para>
</para>
<programlisting>$TTL 3600 <programlisting>$TTL 3600
@ -3844,6 +3829,7 @@ www IN CNAME @</programlisting>
<para>This file gives the proper IP address to hostname <para>This file gives the proper IP address to hostname
mappings of our above fictitious domain.</para> mappings of our above fictitious domain.</para>
<para>It is worth noting that all names on the right side <para>It is worth noting that all names on the right side
of a PTR record need to be fully qualified (i.e., end in of a PTR record need to be fully qualified (i.e., end in
a <quote>.</quote>).</para> a <quote>.</quote>).</para>
@ -3991,7 +3977,7 @@ www IN CNAME @</programlisting>
<listitem> <listitem>
<para>This specifies the default directory hierarchy for <para>This specifies the default directory hierarchy for
the <application>Apache</application> installation. Binaries are stored in the the <application>Apache</application> installation. Binaries are stored in the
<filename class="directory">bin</filename> and <filename class="directory">bin</filename> and
<filename class="directory">sbin</filename> subdirectories <filename class="directory">sbin</filename> subdirectories
of the server root, and configuration files are stored in of the server root, and configuration files are stored in
<filename class="directory">etc/apache</filename>.</para> <filename class="directory">etc/apache</filename>.</para>
@ -4281,7 +4267,7 @@ DocumentRoot /www/someotherdomain.tld
from the ports system.</para> from the ports system.</para>
<screen>&prompt.root; <userinput>cd /usr/ports/www/rubygem-rails; make all install clean</userinput></screen> <screen>&prompt.root; <userinput>cd /usr/ports/www/rubygem-rails; make all install clean</userinput></screen>
</sect3> </sect3>
<sect3> <sect3>
<title>mod_perl</title> <title>mod_perl</title>
@ -5215,7 +5201,7 @@ syslogd_flags="-a logclient.example.com -vv"</programlisting>
<para>Similar to log servers, clients must also meet a few minimum <para>Similar to log servers, clients must also meet a few minimum
requirements:</para> requirements:</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>&man.syslogd.8; must be configured to send messages of <para>&man.syslogd.8; must be configured to send messages of