From 0d7c482e60bbd569643e37260cd4a7a9210e2863 Mon Sep 17 00:00:00 2001
From: teastep
Date: Sun, 1 Jul 2007 17:02:22 +0000
Subject: [PATCH] More document munging
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6736 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
docs/Install.xml | 115 +++++++++++++++++++++++------------------------
web/download.htm | 55 +++++++++++++++--------
2 files changed, 94 insertions(+), 76 deletions(-)
diff --git a/docs/Install.xml b/docs/Install.xml
index 21e5ffc98..115157859 100644
--- a/docs/Install.xml
+++ b/docs/Install.xml
@@ -94,24 +94,24 @@
work.
If you are installing Shorewall 4.0.0 or later then you need
to install at least two packages.
-
- Shorewall
-
-
Either Shorewall-shell (the classic shell-based
configuration compiler) and/or Shorewall-perl (the newer and
faster compiler written in Perl).
+
+
+ Shorewall-common
+
If you are installing Shorewall for the first
time, we strongly suggest that you install Shorewall-perl.
- Install the RPM
+ Install the RPMs
- rpm -ivh <shorewall rpm> <compiler rpm> ...
+ rpm -ivh <compiler rpm> ... <shorewall-common rpm>
Some users are in the habit of using the rpm
@@ -145,6 +145,8 @@
rpm -ivh --nodeps <rpms>
+
+ Example:rpm -ivh shorewall-perl-4.0.0-1.noarch.rpm shorewall-common-4.0.0-1.noarch.rpm
@@ -180,52 +182,45 @@
Install using tarball
- If you are installing Shorewall 4.0.0 or later, then you need to
- install one of the configuration compilers before you install Shorewall itself. You can
- choose to install one or both compilers:
+ If you are installing Shorewall 4.0.0 or later then you need to
+ install at least two packages.
- Shorewall-shell - the classic configuration compiler written
- in Bourne Shell.
+ Either Shorewall-shell (the classic shell-based
+ configuration compiler) and/or Shorewall-perl (the newer and
+ faster compiler written in Perl).
- Shorewall-perl - a newer and faster compiler written in
- Perl.
+ Shorewall-common
If you are installing Shorewall for the first time, we
strongly suggest that you install Shorewall-perl.
-
- To install Shorewall-perl:
-
- unpack the tarball (tar -zxf
- shorewall-perl-x.y.z.tgz).
-
-
-
- cd to the shorewall-perl directory (the version is encoded
- in the directory name as in
- shorewall-perl-4.0.0
).
-
-
-
- Type:
-
- ./install.sh
-
- Installing Shorewall-shell is similar.
- To install Shorewall using the tarball and install script:
+ To install Shorewall-perl and Shorewall-common using the tarball and
+ install scripts:
- unpack the tarball (tar -zxf shorewall-x.y.z.tgz).
+ unpack the tarballs:tar -jxf shorewall-common-4.0.0.tar.bz2
+tar -jxf shorewall-perl-4.0.0.tar.bz2
+
- cd to the shorewall directory (the version is encoded in the
- directory name as in shorewall-3.2.1
).
+ cd to the shorewall-perl directory (the version is encoded in
+ the directory name as in shorewall-perl-4.0.0
).
+
+
+
+ Type:
+
+ ./install.sh
+
+
+
+ cd to the shorewall-common directory (the version is encoded in
+ the directory name as in shorewall-perl-4.0.0
)
@@ -260,25 +255,13 @@
-
- Install the .lrp
-
- To install my version of Shorewall on a fresh Bering disk, simply
- replace the shorwall.lrp
file on the image with the file
- that you downloaded. For example, if you download
- shorewall-lrp-2.2.0.tgz then you will rename the file
- to shorwall.lrp and replace the file by that name on
- the Bering disk with the new file. Then proceed to configure Shorewall as
- described in the Bering (or Bering uClibc) documentation.
-
-
Install the .deb
- Once you have installed the .deb package and before you attempt to
- configure Shorewall, please heed the advice of Lorenzo Martignoni, the
- Shorewall Debian Maintainer:
+ Once you have installed the .deb packages and before you attempt
+ to configure Shorewall, please heed the advice of Lorenzo Martignoni,
+ the Shorewall Debian Maintainer:
For more information about Shorewall usage on Debian system
please look at /usr/share/doc/shorewall/README.Debian provided by [the]
@@ -369,7 +352,7 @@ Pin-Priority: 700Then
Upgrade the RPM
- rpm -Uvh <shorewall-common rpm file> <compiler rpm file> ...
+ rpm -Uvh <compiler rpm file> ... <shorewall-common rpm file>
Some SUSE users have encountered a
@@ -424,14 +407,30 @@ Pin-Priority: 700Then
- unpack the tarball.
-
- tar -zxf shorewall-x.y.z.tgz
+ unpack the tarballs:tar -jxf shorewall-common-4.0.0.tar.bz2
+tar -jxf shorewall-perl-4.0.0.tar.bz2
+tar -jxf shorewall-shell-4.0.0.tar.bz2 (if you use this compiler)
- cd to the shorewall directory (the version is encoded in the
- directory name as in shorewall-3.2.1
).
+ cd to the shorewall-perl directory (the version is encoded in
+ the directory name as in shorewall-perl-4.0.0
).
+
+
+
+ Type:
+
+ ./install.sh
+
+
+
+ Perform the above two steps for the shorewall-shell directory if
+ you use that compiler.
+
+
+
+ cd to the shorewall-common directory (the version is encoded in
+ the directory name as in shorewall-perl-4.0.0
)
diff --git a/web/download.htm b/web/download.htm
index 1c0ac099a..7fe31aa61 100644
--- a/web/download.htm
+++ b/web/download.htm
@@ -56,39 +56,57 @@ download from the Download Sites listed in the table below.
NOTICE: There are two current Shorewall Release
Series:
- The STABLE release series is 3.4. Choose
+
The STABLE release series is 4.0. Choose
this release if you value stability and good documentation.
- The DEVELOPMENT release series is 3.9 (found in the 'development'
+
The DEVELOPMENT release series is 4.1 (found in the 'development'
directory). Choose this release if you are very
experienced user and you are willing to help
- and report bugs. THIS VERSION IS EXPERIMENTAL AND IS NOT
- SUPPORTED.
+ test the code and report bugs. THIS VERSION IS EXPERIMENTAL AND
+ IS NOT SUPPORTED.
For additional information, see this article about the Shorewall Release Model.
-Beginning with Shorewall version 3.2.0 RC1, there are two related
-products:
-
+Beginning with Shorewall version 4.0.0 RC1, there are four related
+packages:
- - Shorewall -- the full Shorewall package. You must have this installed
- on at least one system within your network.
-
+ - Shorewall-shell -- the legacy Shorewall configuration compiler written
+ in Bourne Shell.
+ - Shorewall-perl -- an implementation of the Shorewall configuration
+ compiler written in the Perl programming language. This compiler is much
+ faster than Shorewall-shell and produces a firewall script that runs
+ faster. It is the preferred compiler for new Shorewall installations.
+ - Shorewall-common -- A base package required by both Shorewall-shell and
+ Shorewall-perl.
- Shorewall Lite -- a light-weight Shorewall version that will run
- compiled firewall scripts generated on a system with the full package
- installed.
+ compiled firewall scripts generated on a system with one of the compiler
+ packages installed.
-You probably don't want to install both
-Shorewall and Shorewall Lite on the same system. See the
+ On at least one system in your network, you must install one or both of
+ the compilers (Shorewall-shell and/or Shorewall-perl) and the
+ Shorewall-common package.
+ If you only have a single firewall, then that system should be your
+ firewall system.
+ If you have more than one firewall, you may wish to install one or both
+ of the compilers on a single administrative system and install
+ Shorewall-lite on the firewalls. Doing so will allow for centralized
+ administration and configuration of the firewalls.
+
+
+
+You probably don't want to install both a
+Shorewall compiler and Shorewall Lite on the same system. See the Shorewall Lite Documentation for
details.
+
-
-Once you've printed the appropriate QuickStart Guide, download one
-of the modules:
+Once you've printed the appropriate QuickStart Guide, download the
+appropriate modules: