mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-24 06:29:03 +01:00
Use simple tables in index; add additional information to simple bridge doc
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4736 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
1bfb09dd6c
commit
0ee37b2024
@ -68,80 +68,74 @@
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para><ulink url="configuration_file_basics.htm">Configuration File
|
||||
Basics</ulink></para>
|
||||
Basics</ulink><blockquote>
|
||||
<para><informaltable frame="none">
|
||||
<tgroup cols="2">
|
||||
<tbody valign="middle">
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Comments">Comments in
|
||||
configuration files</ulink></entry>
|
||||
|
||||
<blockquote>
|
||||
<para><table frame="none">
|
||||
<title></title>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Variables">Using
|
||||
Shell Variables</ulink></entry>
|
||||
</row>
|
||||
|
||||
<tgroup cols="2">
|
||||
<tbody>
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Comments">Comments in
|
||||
configuration files</ulink></entry>
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#COMMENT">Attach
|
||||
Comment to Netfilter Rules</ulink></entry>
|
||||
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Variables">Using Shell
|
||||
Variables</ulink></entry>
|
||||
</row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#dnsnames">Using DNS
|
||||
Names</ulink></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#COMMENT">Attach Comment
|
||||
to Netfilter Rules</ulink></entry>
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Continuation">Line
|
||||
Continuation</ulink></entry>
|
||||
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#dnsnames">Using DNS
|
||||
Names</ulink></entry>
|
||||
</row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Compliment">Complementing
|
||||
an IP address or Subnet</ulink></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Continuation">Line
|
||||
Continuation</ulink></entry>
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#INCLUDE">INCLUDE
|
||||
Directive</ulink></entry>
|
||||
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Compliment">Complementing
|
||||
an IP address or Subnet</ulink></entry>
|
||||
</row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#IPRanges">IP Address
|
||||
Ranges</ulink></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#INCLUDE">INCLUDE
|
||||
Directive</ulink></entry>
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Ports">Port
|
||||
Numbers/Service Names</ulink></entry>
|
||||
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#IPRanges">IP Address
|
||||
Ranges</ulink></entry>
|
||||
</row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Levels">Shorewall
|
||||
Configurations (making a test
|
||||
configuration)</ulink></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Ports">Port
|
||||
Numbers/Service Names</ulink></entry>
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Ranges">Port
|
||||
Ranges</ulink></entry>
|
||||
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Levels">Shorewall
|
||||
Configurations (making a test
|
||||
configuration)</ulink></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#Ranges">Port
|
||||
Ranges</ulink></entry>
|
||||
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#MAC">Using MAC
|
||||
Addresses in Shorewall</ulink></entry>
|
||||
</row>
|
||||
</tbody>
|
||||
</tgroup>
|
||||
</table></para>
|
||||
</blockquote>
|
||||
|
||||
<para></para>
|
||||
<entry><ulink
|
||||
url="configuration_file_basics.htm#MAC">Using MAC
|
||||
Addresses in Shorewall</ulink></entry>
|
||||
</row>
|
||||
</tbody>
|
||||
</tgroup>
|
||||
</informaltable></para>
|
||||
</blockquote></para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
@ -153,21 +147,29 @@
|
||||
Guides. Please review the appropriate guide before trying to use this
|
||||
documentation directly.</para>
|
||||
|
||||
<table frame="none">
|
||||
<title>Alphabetical Index</title>
|
||||
|
||||
<tgroup cols="3">
|
||||
<informaltable frame="none">
|
||||
<tgroup align="left" cols="3">
|
||||
<tbody>
|
||||
<row>
|
||||
<entry><ulink url="Kernel2.6.html">2.6 Kernel</ulink></entry>
|
||||
|
||||
<entry><ulink url="IPSEC-2.6.html">IPSEC using Kernel 2.6 and
|
||||
Shorewall 2.1 or Later</ulink></entry>
|
||||
|
||||
<entry><ulink url="Multiple_Zones.html">Routing on One
|
||||
Interface</ulink></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink url="Accounting.html">Accounting</ulink></entry>
|
||||
|
||||
<entry><ulink url="ipsets.html">Ipsets</ulink></entry>
|
||||
|
||||
<entry><ulink url="samba.htm">Samba</ulink></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink url="Accounting.html">Accounting</ulink></entry>
|
||||
<entry><ulink url="Actions.html">Actions</ulink></entry>
|
||||
|
||||
<entry><ulink url="Shorewall_and_Kazaa.html">Kazaa
|
||||
Filtering</ulink></entry>
|
||||
@ -177,7 +179,8 @@
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink url="Actions.html">Actions</ulink></entry>
|
||||
<entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased
|
||||
(virtual) Interfaces (e.g., eth0:0)</ulink></entry>
|
||||
|
||||
<entry><ulink url="kernel.htm">Kernel
|
||||
Configuration</ulink></entry>
|
||||
@ -187,8 +190,8 @@
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink url="Shorewall_and_Aliased_Interfaces.html">Aliased
|
||||
(virtual) Interfaces (e.g., eth0:0)</ulink></entry>
|
||||
<entry><ulink url="traffic_shaping.htm">Bandwidth
|
||||
Control</ulink></entry>
|
||||
|
||||
<entry><ulink url="PortKnocking.html#Limit">Limiting per-IPaddress
|
||||
Connection Rate</ulink></entry>
|
||||
@ -197,8 +200,8 @@
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink url="traffic_shaping.htm">Bandwidth
|
||||
Control</ulink></entry>
|
||||
<entry><ulink
|
||||
url="blacklisting_support.htm">Blacklisting</ulink></entry>
|
||||
|
||||
<entry><ulink url="shorewall_logging.html">Logging</ulink></entry>
|
||||
|
||||
@ -207,8 +210,8 @@
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink
|
||||
url="blacklisting_support.htm">Blacklisting</ulink></entry>
|
||||
<entry>Bridge: <ulink url="bridge.html">With physdev match
|
||||
support</ulink></entry>
|
||||
|
||||
<entry><ulink url="Macros.html">Macros</ulink></entry>
|
||||
|
||||
@ -218,9 +221,8 @@
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry>Bridging/Firewall: <ulink url="bridge.html">With physdev
|
||||
match support</ulink> — <ulink url="NewBridge.html">Without
|
||||
physdev match support</ulink></entry>
|
||||
<entry>Bridge: <ulink url="NewBridge.html">Without physdev match
|
||||
support</ulink></entry>
|
||||
|
||||
<entry><ulink url="MAC_Validation.html">MAC
|
||||
Verification</ulink></entry>
|
||||
@ -230,8 +232,8 @@
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink url="SimpleBridge.html">Bridge (don't need to
|
||||
control traffic through the bridge)</ulink></entry>
|
||||
<entry>Bridge: <ulink url="SimpleBridge.html">No control of
|
||||
traffic through the bridge</ulink></entry>
|
||||
|
||||
<entry><ulink url="MultiISP.html">Multiple Internet Connections
|
||||
from a Single Firewall</ulink></entry>
|
||||
@ -405,18 +407,8 @@
|
||||
|
||||
<entry></entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><ulink url="IPSEC-2.6.html">IPSEC using Kernel 2.6 and
|
||||
Shorewall 2.1 or Later</ulink></entry>
|
||||
|
||||
<entry><ulink url="Multiple_Zones.html">Routing on One
|
||||
Interface</ulink></entry>
|
||||
|
||||
<entry></entry>
|
||||
</row>
|
||||
</tbody>
|
||||
</tgroup>
|
||||
</table>
|
||||
</informaltable>
|
||||
</section>
|
||||
</article>
|
@ -93,6 +93,13 @@
|
||||
bridge-specific changes are restricted to the
|
||||
<filename>/etc/shorewall/interfaces</filename> file.</para>
|
||||
|
||||
<para>This example illustrates the bridging of two ethernet devices but
|
||||
the types of the devices really isn't important. What is shown here would
|
||||
apply equally to bridging an ethernet device to an <ulink
|
||||
url="OPENVPN.html">OpenVPN</ulink> tap device (e.g.,
|
||||
<filename>tap0</filename>) or to a wireless device
|
||||
(<filename>ath0</filename> or <filename>wlan0</filename>).</para>
|
||||
|
||||
<para><filename>/etc/shorewall/interfaces</filename>:</para>
|
||||
|
||||
<programlisting>#ZONE INTERFACE BROADCAST OPTIONS
|
||||
|
Loading…
Reference in New Issue
Block a user