Fix typo in the 6to4 doc; document use of dhcpcd interface

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9380 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2009-01-31 17:27:24 +00:00
parent 56d9c0c7c7
commit 0e49b9ced8
3 changed files with 19 additions and 9 deletions

View File

@ -119,7 +119,7 @@ INTERFACES="eth2 eth4"
SLA=1
GATEWAY=::192.88.99.1</programlisting>
<para>eth3 is the interface to my local network (both wired and
<para>eth2 is the interface to my local network (both wired and
wireless). eth4 goes to my DMZ which holds a single server. Here is a
diagram of the IPv4 network:</para>

View File

@ -1040,7 +1040,12 @@ gateway:~ #</programlisting>Note that because we used a priority of 1000, the
<listitem>
<para>All provider gateways must be specified explicitly in the
GATEWAY column. 'detect' may not be specified. Note that for ppp
interfaces, the GATEWAY may remain unspecified ("-").</para>
interfaces, the GATEWAY may remain unspecified ("-").<note>
<para>Beginning with Shorewall 4.2.6, 'detect' may be specified
for interfaces whose configuration is managed by dhcpcd.
Shorewall will use dhcpcd's database to determine the gateway IP
address.</para>
</note></para>
</listitem>
<listitem>
@ -1114,7 +1119,9 @@ COMMANDB="ip -$FAMILY route ls"
IF1=eth0
IF2=eth1
#
# Sites to Ping. Must not depend on the associated interface having a default route through it.
# Sites to Ping. Must depend only on routes in the 'main' routing table. If not specified,
# the interface is assumed to be managed by dhcpcd and the script uses the gateway address
# from /var/lib/dhcpcd/dhcpcd-${IFx}.info
#
TARGET1=
TARGET2=
@ -1519,11 +1526,8 @@ Comcast 2 0x200 main eth3 detect track,balance
<para>The <emphasis role="bold">loose</emphasis> option on Avvanta results
in fewer routing rules. The first two routing rules below insure that all
traffic from Avvanta-assigned IP addresses is sent via the Avvanta
provider. Note that because the Comcast line has a dynamic IP address, I
am not able to use USE_DEFAULT_RT=Yes in
<filename>/etc/shorewall/shorewall.conf</filename>. The 'tun*' included in
the COPY column is there because I run a routed OpenVPN server on the
firewall.</para>
provider. The 'tun*' included in the COPY column is there because I run a
routed OpenVPN server on the firewall.</para>
<para><filename>/etc/shorewall/route_rules</filename>:</para>

View File

@ -1614,7 +1614,13 @@ net all DROP info</programlisting>then the chain name is 'net2all'
<listitem>
<para>All provider gateways must be specified explicitly in the
GATEWAY column. <emphasis role="bold">detect</emphasis> may not
be specified.</para>
be specified.<note>
<para>Beginning with Shorewall 4.2.6, <emphasis
role="bold">detect</emphasis> may be specified for
interfaces whose configuration is managed by dhcpcd.
Shorewall will use dhcpcd's database to find the
interfaces's gateway.</para>
</note></para>
</listitem>
<listitem>