mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-22 22:30:58 +01:00
More 4.0.0 Doc updates
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6852 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep
parent
093112b473
commit
7554183e03
@ -37,9 +37,6 @@
|
|||||||
<section id="Intro">
|
<section id="Intro">
|
||||||
<title>Introduction</title>
|
<title>Introduction</title>
|
||||||
|
|
||||||
<para>Shorewall version 4 is currently in development and is available for
|
|
||||||
beta testing.</para>
|
|
||||||
|
|
||||||
<para>Shorewall version 4 represents a substantial shift in direction for
|
<para>Shorewall version 4 represents a substantial shift in direction for
|
||||||
Shorewall. Up to now</para>
|
Shorewall. Up to now</para>
|
||||||
|
|
||||||
@ -202,11 +199,26 @@
|
|||||||
</row>
|
</row>
|
||||||
|
|
||||||
<row>
|
<row>
|
||||||
<entry></entry>
|
<entry morerows="1" valign="middle">Shorewall-common
|
||||||
|
4.0.0-RC2</entry>
|
||||||
|
|
||||||
<entry></entry>
|
<entry>Shorewall-shell 4.0.0-RC1</entry>
|
||||||
|
|
||||||
<entry></entry>
|
<entry>Shorewall-perl 4.0.0-RC1</entry>
|
||||||
|
</row>
|
||||||
|
|
||||||
|
<row>
|
||||||
|
<entry>Shorewall-shell 4.0.0-RC2</entry>
|
||||||
|
|
||||||
|
<entry>Shorewall-perl 4.0.0-RC2</entry>
|
||||||
|
</row>
|
||||||
|
|
||||||
|
<row>
|
||||||
|
<entry valign="middle">Shorewall-common 4.0.0</entry>
|
||||||
|
|
||||||
|
<entry>Shorewall-shell 4.0.0</entry>
|
||||||
|
|
||||||
|
<entry>Shorewall-perl 4.0.0</entry>
|
||||||
</row>
|
</row>
|
||||||
</tbody>
|
</tbody>
|
||||||
</tgroup>
|
</tgroup>
|
||||||
|
|||||||
@ -37,8 +37,7 @@
|
|||||||
<section id="What">
|
<section id="What">
|
||||||
<title>Shorewall-perl - What is it?</title>
|
<title>Shorewall-perl - What is it?</title>
|
||||||
|
|
||||||
<para>Shorewall-perl is a companion product to Shorewall. It requires
|
<para>Shorewall-perl is a companion product to Shorewall.</para>
|
||||||
Shorewall 3.4.2 or later (Shorewall 3.4.4 or later recommended).</para>
|
|
||||||
|
|
||||||
<para>Shorewall-perl contains a re-implementation of the Shorewall
|
<para>Shorewall-perl contains a re-implementation of the Shorewall
|
||||||
compiler written in Perl. The advantages of using Shorewall-perl over
|
compiler written in Perl. The advantages of using Shorewall-perl over
|
||||||
@ -524,98 +523,53 @@ eth0 eth1:!192.168.4.9 ...</programlisting></para>
|
|||||||
<section id="Install">
|
<section id="Install">
|
||||||
<title>Shorewall-perl - Installation</title>
|
<title>Shorewall-perl - Installation</title>
|
||||||
|
|
||||||
<caution>
|
|
||||||
<para>Shorewall-perl is still part of the <ulink
|
|
||||||
url="ReleaseModel.html">current development release</ulink>. Use it at
|
|
||||||
your own risk.</para>
|
|
||||||
</caution>
|
|
||||||
|
|
||||||
<para>Either</para>
|
<para>Either</para>
|
||||||
|
|
||||||
<programlisting><command>tar -jxf shorewall-perl-4.0.0-Betax.tar.bz2</command>
|
<programlisting><command>tar -jxf shorewall-perl-4.0.x.tar.bz2</command>
|
||||||
<command>cd shorewall-perl-4.0.0-Betax</command>
|
<command>cd shorewall-perl-4.0.x</command>
|
||||||
<command>./install.sh</command></programlisting>
|
<command>./install.sh</command></programlisting>
|
||||||
|
|
||||||
<para>or</para>
|
<para>or</para>
|
||||||
|
|
||||||
<programlisting><command>rpm -ivh shorewall-perl-4.0.0-0Betax.noarch.rpm</command></programlisting>
|
<programlisting><command>rpm -ivh shorewall-perl-4.0.x.noarch.rpm</command></programlisting>
|
||||||
|
|
||||||
<para>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.</para>
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section id="Using">
|
<section id="Using">
|
||||||
<title>Using Shorewall-perl</title>
|
<title>Using Shorewall-perl</title>
|
||||||
|
|
||||||
<section id="V3.4.3">
|
<para>If you only install one compiler, then that compiler will be
|
||||||
<title>Using Shorewall-perl under Shorewall 3.4.2 and Shorewall
|
used.</para>
|
||||||
3.4.3</title>
|
|
||||||
|
|
||||||
<para>By default, the Shorewall-shell compiler will be used.</para>
|
<para>If you install both compilers, then the compiler actually used
|
||||||
|
depends on the SHOREWALL_COMPILER setting in
|
||||||
|
<filename>shorewall.conf</filename>. The value of this option can be
|
||||||
|
either 'perl' or 'shell'.</para>
|
||||||
|
|
||||||
<para>To use the Shorewall-perl compiler, add this to
|
<para>If you add 'SHOREWALL_COMPILER=perl' to
|
||||||
<filename>shorewall.conf</filename>:</para>
|
<filename>/etc/shorewall/shorewall.conf</filename> then by default, the
|
||||||
|
new compiler will be used on the system. If you add it to
|
||||||
|
<filename>shorewall.conf</filename> 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.</para>
|
||||||
|
|
||||||
<para>SHOREWALL_COMPILER=perl</para>
|
<para>If you only install one compiler, it is suggested that you do not
|
||||||
|
set SHOREWALL_COMPILER.</para>
|
||||||
|
|
||||||
<para>If you add this setting to
|
<para>You may also select the compiler to use on the command line using
|
||||||
<filename>/etc/shorewall/shorewall.conf</filename> then by default, the
|
the 'C option:<simplelist>
|
||||||
new compiler will be used on the system.</para>
|
<member>'-C shell' means use the shell compiler</member>
|
||||||
|
|
||||||
<para>Regardless of the setting of SHOREWALL_COMPILER, there is one
|
<member>'-C perl' means use the perl compiler</member>
|
||||||
change in Shorewall operation that is triggered simply by installing
|
</simplelist>The -C option overrides the setting in
|
||||||
Shorewall-perl. Your params file will be processed with the shell's '-a'
|
shorewall.conf.</para>
|
||||||
option which causes any variables that you set or create in that file to
|
|
||||||
be automatically exported. Since the params file is processed before
|
|
||||||
<filename>shorewall.conf</filename>, using -a insures that the settings
|
|
||||||
of your params variables are available to the new compiler should it's
|
|
||||||
use be specified in <filename>shorewall.conf</filename>.</para>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section id="V4.0.0">
|
<para>Example:<programlisting><command>shorewall restart -C perl</command></programlisting></para>
|
||||||
<title>Using Shorewall-perl under Shorewall 3.4.4/4.0.0 Beta and
|
|
||||||
later.</title>
|
|
||||||
|
|
||||||
<para>If you only install one compiler, then that compiler will be
|
<para>When the Shorewall-perl compiler has been selected, the
|
||||||
used.</para>
|
<filename>params</filename> file is processed twice, the second time using
|
||||||
|
the <option>-a</option> option which causes all variables set within the
|
||||||
<para>If you install both compilers, then the compiler actually used
|
file to be exported automatically by the shell. The Shorewall-perl
|
||||||
depends on the SHOREWALL_COMPILER setting in
|
compiler uses the current environmental variables to perform variable
|
||||||
<filename>shorewall.conf</filename>.</para>
|
expansion within the other Shorewall configuration files.</para>
|
||||||
|
|
||||||
<para>The value of this new option can be either 'perl' or
|
|
||||||
'shell'.</para>
|
|
||||||
|
|
||||||
<para>If you add 'SHOREWALL_COMPILER=perl' to
|
|
||||||
<filename>/etc/shorewall/shorewall.conf</filename> then by default, the
|
|
||||||
new compiler will be used on the system. If you add it to
|
|
||||||
<filename>shorewall.conf</filename> 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).</para>
|
|
||||||
|
|
||||||
<para>If you only install one compiler, it is suggested that you do not
|
|
||||||
set SHOREWALL_COMPILER.</para>
|
|
||||||
|
|
||||||
<para>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:<simplelist>
|
|
||||||
<member>'-C shell' means use the shell compiler</member>
|
|
||||||
|
|
||||||
<member>'-C perl' means use the perl compiler</member>
|
|
||||||
</simplelist>The -C option overrides the setting in
|
|
||||||
shorewall.conf.</para>
|
|
||||||
|
|
||||||
<para>Example:<programlisting><command>shorewall restart -C perl</command></programlisting></para>
|
|
||||||
|
|
||||||
<para>When the Shorewall-perl compiler has been selected, the
|
|
||||||
<filename>params</filename> file is processed using the
|
|
||||||
<option>-a</option> 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.</para>
|
|
||||||
</section>
|
|
||||||
</section>
|
</section>
|
||||||
</article>
|
</article>
|
||||||
Loading…
Reference in New Issue
Block a user