From a3d4edfd1ff4bcc52d64a845e2f195bb5c573a99 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 27 Sep 2011 18:13:57 -0700 Subject: [PATCH] Reorganize Shorewall Lite docs --- docs/Anatomy.xml | 8 ++--- docs/Documentation_Index.xml | 50 ++++++++++++++---------------- docs/FAQ.xml | 2 +- docs/Shorewall-Lite.xml | 7 +++++ docs/configuration_file_basics.xml | 6 ++-- docs/shorewall_features.xml | 2 +- 6 files changed, 40 insertions(+), 35 deletions(-) diff --git a/docs/Anatomy.xml b/docs/Anatomy.xml index ec51bf33d..96f81f82d 100644 --- a/docs/Anatomy.xml +++ b/docs/Anatomy.xml @@ -122,7 +122,7 @@ configfiles - A directory containing configuration files to copy to create a Shorewall-lite export + url="Shorewall-Lite.html">Shorewall-lite export directory. @@ -335,7 +335,7 @@ configfiles - A directory containing configuration files to copy to create a Shorewall6-lite export + url="Shorewall-Lite.html">Shorewall6-lite export directory. @@ -535,7 +535,7 @@ shorecap - A shell program used for generating capabilities files. See the Shorewall-lite + url="Shorewall-Lite.html">Shorewall-lite documentation. @@ -725,7 +725,7 @@ shorecap - A shell program used for generating capabilities files. See the Shorewall-lite + url="Shorewall-Lite.html">Shorewall-lite documentation. diff --git a/docs/Documentation_Index.xml b/docs/Documentation_Index.xml index fce2d4d09..ef768ca52 100644 --- a/docs/Documentation_Index.xml +++ b/docs/Documentation_Index.xml @@ -55,7 +55,7 @@ - 6to4 and 6in4 Tunnels + Linux Containers (LXC) @@ -65,7 +65,7 @@ - Accounting + 6to4 and 6in4 Tunnels Linux-vserver @@ -74,7 +74,7 @@ - Actions + Accounting Limiting Connection Rates @@ -84,8 +84,7 @@ - Aliased - (virtual) Interfaces (e.g., eth0:0) + Actions Logging @@ -93,8 +92,8 @@ - Anatomy of - Shorewall + Aliased + (virtual) Interfaces (e.g., eth0:0) Macros @@ -104,8 +103,8 @@ - AUDIT Target - support + Anatomy of + Shorewall MAC Verification @@ -115,8 +114,8 @@ - Bandwidth - Control + AUDIT Target + support Man Pages @@ -125,8 +124,8 @@ - Blacklisting/Whitelisting + Bandwidth + Control Manual Chains @@ -137,8 +136,8 @@ - Bridge: Bridge/Firewall + Blacklisting/Whitelisting Masquerading @@ -148,8 +147,8 @@ - Bridge: No firewalling of - traffic between bridge port + Bridge: Bridge/Firewall Multiple Internet Connections from a Single Firewall @@ -158,8 +157,8 @@ - Building Shorewall from - GIT + Bridge: No firewalling of + traffic between bridge port Multiple Zones Through One Interface @@ -169,19 +168,18 @@ - Commands + Building Shorewall from + GIT My Shorewall Configuration - Traffic - Accounting + - Compiled Firewall - Programs + Commands Netfilter Overview @@ -385,7 +383,7 @@ KVM (Kernel-mode Virtual Machine) - Shorewall + Shorewall Lite diff --git a/docs/FAQ.xml b/docs/FAQ.xml index 16a72ff5a..5aa0792f7 100644 --- a/docs/FAQ.xml +++ b/docs/FAQ.xml @@ -2417,7 +2417,7 @@ etc... Answer: Shorewall Lite is a companion product to Shorewall and is designed to allow you to maintain all Shorewall configuration information on a single system within your - network. See the Compiled + network. See the Compiled Firewall script documentation for details. diff --git a/docs/Shorewall-Lite.xml b/docs/Shorewall-Lite.xml index 648954b30..352ff35b8 100644 --- a/docs/Shorewall-Lite.xml +++ b/docs/Shorewall-Lite.xml @@ -646,6 +646,13 @@ + + The compile command can be used to stage a new compiled strict that + can be activated later using + + + shorewall restart -f +
diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml index 7bd36ce9c..ec994bd3d 100644 --- a/docs/configuration_file_basics.xml +++ b/docs/configuration_file_basics.xml @@ -968,7 +968,7 @@ DNAT net loc:10.0.0.1 tcp 80 ; mark="88" Prior to Shorewall 4.4.17, if you are using Shorewall Lite , it is not + url="Shorewall-Lite.html">Shorewall Lite , it is not advisable to use INCLUDE in the params file in an export directory if you set EXPORTPARAMS=Yes in shorewall.conf (5). If you do @@ -1236,7 +1236,7 @@ SHELL cat /etc/shorewall/rules.d/*.rules 2> /dev/null || true If you are using Shorewall Lite and if the + url="Shorewall-Lite.html">Shorewall Lite and if the params script needs to set shell variables based on the configuration of the firewall system, you can use this trick: @@ -1260,7 +1260,7 @@ SHELL cat /etc/shorewall/rules.d/*.rules 2> /dev/null || trueShorewall-lite configuration. + url="Shorewall-Lite.html">Shorewall-lite configuration. Version 4.4.17 implemented Run-time address variables. In configuration files, these variables are diff --git a/docs/shorewall_features.xml b/docs/shorewall_features.xml index bf9dc5222..f97112be2 100644 --- a/docs/shorewall_features.xml +++ b/docs/shorewall_features.xml @@ -94,7 +94,7 @@ Centrally generated firewall scripts run on the firewalls under control of Shorewall-lite. + url="Shorewall-Lite.html">Shorewall-lite.