From 7554183e03036bc2e87f919d9019a6fe545b40b9 Mon Sep 17 00:00:00 2001 From: teastep Date: Thu, 12 Jul 2007 20:48:19 +0000 Subject: [PATCH] More 4.0.0 Doc updates git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6852 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- docs/Shorewall-4.xml | 24 ++++++--- docs/Shorewall-perl.xml | 108 ++++++++++++---------------------------- 2 files changed, 49 insertions(+), 83 deletions(-) diff --git a/docs/Shorewall-4.xml b/docs/Shorewall-4.xml index 72119550e..7b0261c22 100644 --- a/docs/Shorewall-4.xml +++ b/docs/Shorewall-4.xml @@ -37,9 +37,6 @@
Introduction - Shorewall version 4 is currently in development and is available for - beta testing. - Shorewall version 4 represents a substantial shift in direction for Shorewall. Up to now @@ -202,11 +199,26 @@ - + Shorewall-common + 4.0.0-RC2 - + Shorewall-shell 4.0.0-RC1 - + Shorewall-perl 4.0.0-RC1 + + + + Shorewall-shell 4.0.0-RC2 + + Shorewall-perl 4.0.0-RC2 + + + + Shorewall-common 4.0.0 + + Shorewall-shell 4.0.0 + + Shorewall-perl 4.0.0 diff --git a/docs/Shorewall-perl.xml b/docs/Shorewall-perl.xml index 97dbad1a7..0e52e1e2f 100644 --- a/docs/Shorewall-perl.xml +++ b/docs/Shorewall-perl.xml @@ -37,8 +37,7 @@
Shorewall-perl - What is it? - Shorewall-perl is a companion product to Shorewall. It requires - Shorewall 3.4.2 or later (Shorewall 3.4.4 or later recommended). + Shorewall-perl is a companion product to Shorewall. Shorewall-perl contains a re-implementation of the Shorewall compiler written in Perl. The advantages of using Shorewall-perl over @@ -524,98 +523,53 @@ eth0 eth1:!192.168.4.9 ...
Shorewall-perl - Installation - - Shorewall-perl is still part of the current development release. Use it at - your own risk. - - Either - tar -jxf shorewall-perl-4.0.0-Betax.tar.bz2 -cd shorewall-perl-4.0.0-Betax + tar -jxf shorewall-perl-4.0.x.tar.bz2 +cd shorewall-perl-4.0.x ./install.sh or - rpm -ivh shorewall-perl-4.0.0-0Betax.noarch.rpm - - Note that you can also install the current Shorewall 4.0.0 Beta - version of Shorewall. If you do that and still want access to the legacy - shell-based compiler, you must also install the Shorewall-shell - package. + rpm -ivh shorewall-perl-4.0.x.noarch.rpm
Using Shorewall-perl -
- Using Shorewall-perl under Shorewall 3.4.2 and Shorewall - 3.4.3 + If you only install one compiler, then that compiler will be + used. - By default, the Shorewall-shell compiler will be used. + If you install both compilers, then the compiler actually used + depends on the SHOREWALL_COMPILER setting in + shorewall.conf. The value of this option can be + either 'perl' or 'shell'. - To use the Shorewall-perl compiler, add this to - shorewall.conf: + If you add 'SHOREWALL_COMPILER=perl' to + /etc/shorewall/shorewall.conf then by default, the + new compiler will be used on the system. If you add it to + shorewall.conf in a separate directory (such as a + Shorewall-lite export directory) then the new compiler will only be used + when you compile from that directory. - SHOREWALL_COMPILER=perl + If you only install one compiler, it is suggested that you do not + set SHOREWALL_COMPILER. - If you add this setting to - /etc/shorewall/shorewall.conf then by default, the - new compiler will be used on the system. + You may also select the compiler to use on the command line using + the 'C option: + '-C shell' means use the shell compiler - Regardless of the setting of SHOREWALL_COMPILER, there is one - change in Shorewall operation that is triggered simply by installing - Shorewall-perl. Your params file will be processed with the shell's '-a' - option which causes any variables that you set or create in that file to - be automatically exported. Since the params file is processed before - shorewall.conf, using -a insures that the settings - of your params variables are available to the new compiler should it's - use be specified in shorewall.conf. -
+ '-C perl' means use the perl compiler + The -C option overrides the setting in + shorewall.conf. -
- Using Shorewall-perl under Shorewall 3.4.4/4.0.0 Beta and - later. + Example:shorewall restart -C perl - If you only install one compiler, then that compiler will be - used. - - If you install both compilers, then the compiler actually used - depends on the SHOREWALL_COMPILER setting in - shorewall.conf. - - The value of this new option can be either 'perl' or - 'shell'. - - If you add 'SHOREWALL_COMPILER=perl' to - /etc/shorewall/shorewall.conf then by default, the - new compiler will be used on the system. If you add it to - shorewall.conf in a separate directory (such as a - Shorewall-lite export directory) then the new compiler will only be used - when you compile from that directory (4.0.0 Beta6 and later - only). - - If you only install one compiler, it is suggested that you do not - set SHOREWALL_COMPILER. - - If you install Shorewall-perl under Shorewall 3.4.4 or later, you - can select the compiler to use on the command line using the 'C - option: - '-C shell' means use the shell compiler - - '-C perl' means use the perl compiler - The -C option overrides the setting in - shorewall.conf. - - Example:shorewall restart -C perl - - When the Shorewall-perl compiler has been selected, the - params file is processed using the - option which causes all variables set within the - file to be exported automatically by the shell. The Shorewall-perl - compiler uses the current environmental variables to perform variable - expansion within the other Shorewall configuration files. -
+ When the Shorewall-perl compiler has been selected, the + params file is processed twice, the second time using + the option which causes all variables set within the + file to be exported automatically by the shell. The Shorewall-perl + compiler uses the current environmental variables to perform variable + expansion within the other Shorewall configuration files.
\ No newline at end of file