mirror of
https://gitlab.com/shorewall/code.git
synced 2025-05-19 07:31:00 +02:00
Make Documentation page refer to 3.x and 4.x equally
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6855 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep
parent
7554183e03
commit
a3f78b51e7
@ -203,7 +203,11 @@ sub timestamp() {
|
||||
sub progress_message {
|
||||
if ( $verbose > 1 ) {
|
||||
timestamp if $timestamp;
|
||||
my $line = join( ' ', @_ );
|
||||
#
|
||||
# We use this function to display messages containing raw config file images which may contains tabs (including multiple tabs in succession).
|
||||
# The following makes such messages look more readable and uniform
|
||||
#
|
||||
my $line = "@_";
|
||||
$line =~ s/\s+/ /g;
|
||||
print "$line\n";
|
||||
}
|
||||
|
||||
@ -103,10 +103,7 @@ sub setup_route_marking() {
|
||||
add_rule $chainref, "-m mark ! --mark 0/$mask -j CONNMARK --save-mark --mask $mask";
|
||||
}
|
||||
|
||||
sub setup_providers() {
|
||||
my $providers = 0;
|
||||
|
||||
sub copy_table( $$ ) {
|
||||
sub copy_table( $$ ) {
|
||||
my ( $duplicate, $number ) = @_;
|
||||
|
||||
emitj( "ip route show table $duplicate | while read net route; do",
|
||||
@ -119,9 +116,9 @@ sub setup_providers() {
|
||||
' esac',
|
||||
"done\n"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
sub copy_and_edit_table( $$$ ) {
|
||||
sub copy_and_edit_table( $$$ ) {
|
||||
my ( $duplicate, $number, $copy ) = @_;
|
||||
|
||||
emitj ( "ip route show table $duplicate | while read net route; do",
|
||||
@ -137,9 +134,9 @@ sub setup_providers() {
|
||||
' ;;',
|
||||
' esac',
|
||||
"done\n" );
|
||||
}
|
||||
}
|
||||
|
||||
sub balance_default_route( $$$ ) {
|
||||
sub balance_default_route( $$$ ) {
|
||||
my ( $weight, $gateway, $interface ) = @_;
|
||||
|
||||
$balance = 1;
|
||||
@ -161,9 +158,9 @@ sub setup_providers() {
|
||||
emit "DEFAULT_ROUTE=\"\$DEFAULT_ROUTE nexthop dev $interface weight $weight\"";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub add_a_provider( $$$$$$$$ ) {
|
||||
sub add_a_provider( $$$$$$$$ ) {
|
||||
|
||||
my ($table, $number, $mark, $duplicate, $interface, $gateway, $options, $copy) = @_;
|
||||
|
||||
@ -246,6 +243,10 @@ sub setup_providers() {
|
||||
}
|
||||
|
||||
$providers{$table} = {};
|
||||
#
|
||||
# Setup_Providers() Starts Here....
|
||||
#
|
||||
|
||||
$providers{$table}{number} = $number;
|
||||
$providers{$table}{mark} = $val;
|
||||
|
||||
@ -301,13 +302,17 @@ sub setup_providers() {
|
||||
" ${iface}_up="
|
||||
);
|
||||
} else {
|
||||
emit " fatal_error \"ERROR: Interface $interface is not configured -- Provider $table ($number) Cannot be Added\"";
|
||||
emit " fatal_error \"ERROR: Interface $interface is not configured --
|
||||
#
|
||||
# Setup_Providers() Starts Here....
|
||||
#
|
||||
Provider $table ($number) Cannot be Added\"";
|
||||
}
|
||||
|
||||
emit "fi\n";
|
||||
}
|
||||
}
|
||||
|
||||
sub add_an_rtrule( $$$$ ) {
|
||||
sub add_an_rtrule( $$$$ ) {
|
||||
my ( $source, $dest, $provider, $priority ) = @_;
|
||||
|
||||
unless ( $providers{$provider} ) {
|
||||
@ -352,10 +357,11 @@ sub setup_providers() {
|
||||
"echo \"qt ip rule del $source $dest $priority\" >> \${VARDIR}/undo_routing"
|
||||
);
|
||||
progress_message " Routing rule \"$currentline\" $done";
|
||||
}
|
||||
#
|
||||
# Setup_Providers() Starts Here....
|
||||
#
|
||||
}
|
||||
|
||||
sub setup_providers() {
|
||||
my $providers = 0;
|
||||
|
||||
my $fn = open_file 'providers';
|
||||
|
||||
while ( read_a_line ) {
|
||||
@ -422,6 +428,10 @@ sub setup_providers() {
|
||||
|
||||
emit_unindented join( "\n",
|
||||
'#',
|
||||
#
|
||||
# Setup_Providers() Starts Here....
|
||||
#
|
||||
|
||||
'# reserved values',
|
||||
'#',
|
||||
"255\tlocal",
|
||||
|
||||
@ -71,8 +71,9 @@
|
||||
<member><ulink url="manpages/shorewall-hosts.html">hosts</ulink> -
|
||||
Define multiple zones accessed through a single interface</member>
|
||||
|
||||
<member><ulink url="shorewall-interfaces.html">interfaces</ulink> -
|
||||
Define the interfaces on the system and optionally associate them with
|
||||
<member><ulink
|
||||
url="manpages/shorewall-interfaces.html">interfaces</ulink> - Define the
|
||||
interfaces on the system and optionally associate them with
|
||||
zones.</member>
|
||||
|
||||
<member><ulink url="manpages/shorewall-maclist.html">maclist</ulink> -
|
||||
@ -140,8 +141,8 @@
|
||||
- Specify values for global Shorewall options.</member>
|
||||
|
||||
<member><ulink
|
||||
url="manpages/shorewall.conf.html">shorewall-lite.conf</ulink> - Specify
|
||||
values for global Shorewall Lite options.</member>
|
||||
url="manpages/shorewall-lite.conf.html">shorewall-lite.conf</ulink> -
|
||||
Specify values for global Shorewall Lite options.</member>
|
||||
|
||||
<member><ulink url="manpages/shorewall-vardir.html">vardir</ulink> -
|
||||
Redefine the directory where Shorewall keeps its state
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<h1 style="text-align: left;">Shorewall 3.x Documentation<br>
|
||||
<h1 style="text-align: left;">Shorewall Documentation<br>
|
||||
</h1>
|
||||
<span style="font-weight: bold;">Tom Eastep<br>
|
||||
<br>
|
||||
@ -22,44 +22,49 @@ href="GnuCopyright.htm" target="_self">GNU Free Documentation
|
||||
License</a></span>”.<br>
|
||||
</p>
|
||||
|
||||
<p>2007-06-23<br>
|
||||
<p>2007-07-13<br>
|
||||
</p>
|
||||
<hr style="width: 100%; height: 2px;">
|
||||
<br>
|
||||
|
||||
<ul>
|
||||
<li><a href="Documentation_Index.html">Alphabetical <span
|
||||
style="font-weight: bold;">Index</span> of all Articles</a> <a
|
||||
href="http://gomix.homelinux.net/gomix/shorewall/">(En Español)</a> --
|
||||
Over 70 articles with topics ranging from Accounting to Xen<br>
|
||||
<li><strong>Alphabetical Index</strong> -- Over 70 articles with topics
|
||||
ranging from Accounting to Xen
|
||||
<p><a href="Documentation_Index.html">Shorewall 3.x</a></p>
|
||||
<p><a href="4.0/Documentation_Index.html">Shorewall 4.x</a></p>
|
||||
</li>
|
||||
<li><a href="FAQ.htm"><span style="font-weight: bold;">FAQ</span>s</a> --
|
||||
Answers to the most commonly asked questions.<br>
|
||||
<li><strong>FAQs</strong> -- Answers to the most commonly asked questions.
|
||||
<p><a href="FAQ.htm">Shorewall 3.x</a></p>
|
||||
<p><a href="4.0/FAQ.htm">Shorewall 4.x</a></p>
|
||||
</li>
|
||||
<li><strong>Getting Started</strong> -- Introductory Articles and Beginner
|
||||
HOWTOs
|
||||
<p><span style="font-weight: bold;"></span><a
|
||||
href="shorewall_quickstart_guide.htm">Shorewall 3.x</a></p>
|
||||
<p><a href="4.0/shorewall_quickstart_guide.htm">Shorewall 4.x</a></p>
|
||||
</li>
|
||||
<li><a href="GettingStarted.html"><span
|
||||
style="font-weight: bold;"></span>Getting Started</a> -- Introductory
|
||||
Articles and Beginner HOWTOs</li>
|
||||
<li>PPPPPPPS ( or, Paul's Principles for Practical Provision of Packet
|
||||
Processing with Shorewall ) <a
|
||||
href="http://linuxman.wikispaces.com/PPPPPPS">http://linuxman.wikispaces.com/PPPPPPS</a>
|
||||
-- Some very useful tips for dealing with Shorewall from Paul Gear<br>
|
||||
</li>
|
||||
<li><a href="manpages/Manpages.html">Shorewall 3.4 <span
|
||||
style="font-weight: bold;">Manpages</span></a> -- Online version of the
|
||||
manpages released with Shorewall 3.4.0 and later<br>
|
||||
<li>Man Pages -- Online version of the manpages released with Shorewall
|
||||
3.4.0 and later
|
||||
<p><a href="manpages/Manpages.html">Shorewall 3.x</a></p>
|
||||
<p><a href="4.0/Manpages.html">Shorewall 4.x</a></p>
|
||||
</li>
|
||||
<li><a href="shorewall_features.htm">Shorewall <span
|
||||
<li><a href="4.0/shorewall_features.htm">Shorewall <span
|
||||
style="font-weight: bold;">Features</span></a> -- What it can do<br>
|
||||
</li>
|
||||
<li><a href="Shorewall_Doesnt.html"><span
|
||||
<li><a href="4.0/Shorewall_Doesnt.html"><span
|
||||
style="font-weight: bold;">Limitations</span></a> -- Some things that it
|
||||
cannot do<br>
|
||||
</li>
|
||||
<li><a href="troubleshoot.htm"><span
|
||||
<li><a href="4.0/troubleshoot.htm"><span
|
||||
style="font-weight: bold;">Troubleshooting</span> Guide</a> -- Look here
|
||||
when "it doesn't work"<br>
|
||||
</li>
|
||||
<li><a href="upgrade_issues.htm"><span
|
||||
<li><a href="4.0/upgrade_issues.htm"><span
|
||||
style="font-weight: bold;">Upgrade</span> Issues</a> -- avoid problems
|
||||
when upgrading your Shorewall installation</li>
|
||||
</ul>
|
||||
@ -67,10 +72,7 @@ License</a></span>”.<br>
|
||||
|
||||
|
||||
<div style="margin-left: 40px;">
|
||||
<a href="2.0/">Shorewall 2.x Documentation</a>
|
||||
|
||||
<p><a href="4.0/index.html">Shorewall 4.0 Documentation</a></p>
|
||||
</div>
|
||||
<a href="2.0/">Shorewall 2.x Documentation</a> </div>
|
||||
<br>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user