extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-03 03:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Normalise SUSE nomenclature; spelling corrections

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4104 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
paulgear 2006-06-15 05:32:14 +00:00
parent bc0586aa4a
commit aedfe429cf
13 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/shorewall.conf
View File

@ -688,7 +688,7 @@ MODULE_SUFFIX=
# #
# DISABLE IPV6 # DISABLE IPV6
# #
# Distributions (notably SuSE) are beginning to ship with IPV6 # Distributions (notably SUSE) are beginning to ship with IPV6
# enabled. If you are not using IPV6, you are at risk of being # enabled. If you are not using IPV6, you are at risk of being
# exploited by users who do. Setting DISABLE_IPV6=Yes will cause # exploited by users who do. Setting DISABLE_IPV6=Yes will cause
# Shorewall to disable IPV6 traffic to/from and through your # Shorewall to disable IPV6 traffic to/from and through your

4
docs/Documentation.xml
View File

@ -383,7 +383,7 @@
<listitem> <listitem>
<para>file in /etc/shorewall that is used to define the <para>file in /etc/shorewall that is used to define the
iptables/kernel capabilities of a remote system. The file allows iptables/kernel capabilities of a remote system. The file allows
firewall scripts compiled on one system to be taylored for a remote firewall scripts compiled on one system to be tailored for a remote
system where the script will ultimately run under <ulink system where the script will ultimately run under <ulink
url="CompiledPrograms.html#Lite">Shorewall Lite</ulink>.</para> url="CompiledPrograms.html#Lite">Shorewall Lite</ulink>.</para>
</listitem> </listitem>
@ -4085,4 +4085,4 @@ eth1 -</programlisting>
<para>This file is described in the <ulink url="Accounting.html">Traffic <para>This file is described in the <ulink url="Accounting.html">Traffic
Accounting Documentation</ulink>.</para> Accounting Documentation</ulink>.</para>
</section> </section>
</article> </article>

4
docs/FAQ.xml
View File

@ -1491,7 +1491,7 @@ Creating input Chains...
<orderedlist> <orderedlist>
<listitem> <listitem>
<para>The current configuration is compiled to produce a shell <para>The current configuration is compiled to produce a shell
program taylored for your configuration.</para> program tailored for your configuration.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -2050,4 +2050,4 @@ loc $FW ACCEPT </programlisting>
policies.</para> policies.</para>
</section> </section>
</section> </section>
</article> </article>

4
docs/IPSEC-2.6.xml
View File

@ -100,7 +100,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para>The ipsec-tools 0.5 rpm from SUSE 9.3.</para> <para>The ipsec-tools 0.5 rpm from <trademark>SUSE</trademark> 9.3.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
@ -854,4 +854,4 @@ all all REJECT info
ipsec-tools source tree. It has a wide variety of sample racoon ipsec-tools source tree. It has a wide variety of sample racoon
configuration files.</para> configuration files.</para>
</section> </section>
</article> </article>

31
docs/Install.xml
View File

@ -82,7 +82,7 @@
role="bold"><trademark>Power PPC</trademark></emphasis>, <emphasis role="bold"><trademark>Power PPC</trademark></emphasis>, <emphasis
role="bold"><trademark>Trustix</trademark></emphasis> and <emphasis role="bold"><trademark>Trustix</trademark></emphasis> and <emphasis
role="bold"><trademark>TurboLinux</trademark></emphasis>. There is role="bold"><trademark>TurboLinux</trademark></emphasis>. There is
also an RPM package provided by Simon Matter that is taylored for also an RPM package provided by Simon Matter that is tailored for
<trademark><emphasis role="bold">RedHat/Fedora</emphasis></trademark> <trademark><emphasis role="bold">RedHat/Fedora</emphasis></trademark>
and another package from Jack Coates that is customized for <emphasis and another package from Jack Coates that is customized for <emphasis
role="bold"><trademark>Mandriva</trademark></emphasis>. All of these role="bold"><trademark>Mandriva</trademark></emphasis>. All of these
@ -110,10 +110,10 @@
</caution> </caution>
<note> <note>
<para>Some SUSE users have encountered a problem whereby rpm reports <para>Some <trademark>SUSE</trademark> users have encountered
a conflict with kernel &lt;= 2.2 even though a 2.4 kernel is a problem whereby rpm reports a conflict with kernel &lt;= 2.2
installed. If this happens, simply use the --nodeps option to even though a 2.4 kernel is installed. If this happens, simply
rpm.</para> use the --nodeps option to rpm.</para>
<programlisting><filename><command>rpm -ivh --nodeps &lt;shorewall rpm&gt;</command></filename></programlisting> <programlisting><filename><command>rpm -ivh --nodeps &lt;shorewall rpm&gt;</command></filename></programlisting>
</note> </note>
@ -297,11 +297,12 @@
package!</emphasis></para> package!</emphasis></para>
<para>The standard RPM package from shorewall.net and the mirrors is <para>The standard RPM package from shorewall.net and the mirrors is
known to work with Suse, Power PPC, Trustix and TurboLinux. There is known to work with <trademark>SUSE</trademark>, Power PPC,
also an RPM package provided by Simon Matter that is taylored for Trustix and TurboLinux. There is also an RPM package provided by
RedHat/Fedora and another package from Jack Coates that is customized Simon Matter that is tailored for RedHat/Fedora and another
for Mandriva. If you try to upgrade using the wrong package, it package from Jack Coates that is customized for Mandriva. If you
probably won't work.</para> try to upgrade using the wrong package, it probably won't
work.</para>
</listitem> </listitem>
<listitem> <listitem>
@ -310,10 +311,10 @@
<programlisting><command>rpm -Uvh &lt;shorewall rpm file&gt;</command></programlisting> <programlisting><command>rpm -Uvh &lt;shorewall rpm file&gt;</command></programlisting>
<note> <note>
<para>Some SUSE users have encountered a problem whereby rpm reports <para>Some <trademark>SUSE</trademark> users have encountered
a conflict with kernel &lt;= 2.2 even though a 2.4 kernel is a problem whereby rpm reports a conflict with kernel &lt;= 2.2
installed. If this happens, simply use the --nodeps option to even though a 2.4 kernel is installed. If this happens, simply
rpm.</para> use the --nodeps option to rpm.</para>
<programlisting><command>rpm -Uvh --nodeps &lt;shorewall rpm&gt;</command></programlisting> <programlisting><command>rpm -Uvh --nodeps &lt;shorewall rpm&gt;</command></programlisting>
</note> </note>
@ -545,4 +546,4 @@ tar -xzvf /mnt/package2.lrp
<para>See <quote><ulink url="fallback.htm">Fallback and <para>See <quote><ulink url="fallback.htm">Fallback and
Uninstall</ulink></quote>.</para> Uninstall</ulink></quote>.</para>
</section> </section>
</article> </article>

4
docs/OPENVPN.xml
View File

@ -618,7 +618,7 @@ verb 3</programlisting>
</section> </section>
<section> <section>
<title>Eastepnc6000 (SUSE10.0) Configuration</title> <title>Eastepnc6000 (SUSE 10.0) Configuration</title>
<para>The configuration was the same as shown above only with <para>The configuration was the same as shown above only with
"/Program Files/OpenVPN" replaced with "/etc/openvpn" (I love "/Program Files/OpenVPN" replaced with "/etc/openvpn" (I love
@ -718,4 +718,4 @@ all all REJECT info
</section> </section>
</section> </section>
</section> </section>
</article> </article>

4
docs/Xen.xml
View File

@ -49,7 +49,7 @@
<firstterm>paravirtualization</firstterm> tool that allows you to run <firstterm>paravirtualization</firstterm> tool that allows you to run
multiple virtual machines on one physical machine. It is available on a multiple virtual machines on one physical machine. It is available on a
wide number of platforms and is included in recent wide number of platforms and is included in recent
<trademark>SuSE</trademark> distributions.</para> <trademark>SUSE</trademark> distributions.</para>
<para>Xen refers to the virtual machines as <para>Xen refers to the virtual machines as
<firstterm>Domains</firstterm>. Domains are numbered with the first domain <firstterm>Domains</firstterm>. Domains are numbered with the first domain
@ -254,4 +254,4 @@ Ping/ACCEPT dmz ursa</programlisting>
article.</para> article.</para>
</section> </section>
</section> </section>
</article> </article>

18
docs/XenMyWay.xml
View File

@ -99,7 +99,7 @@
</listitem> </listitem>
</orderedlist> </orderedlist>
<para>Most of the Linux systems run SuSE 10.0 or SuSE 10.1; my personal <para>Most of the Linux systems run SUSE 10.0 or SUSE 10.1; my personal
Linux desktop system runs Ubuntu "Dapper Drake".</para> Linux desktop system runs Ubuntu "Dapper Drake".</para>
<para>If you are unfamiliar with Xen networking, I recommend that you read <para>If you are unfamiliar with Xen networking, I recommend that you read
@ -317,7 +317,7 @@ disk = [ 'phy:hdb4,hdb4,w' ]</programlisting>
delegation<footnote> delegation<footnote>
<para>PCI delegation was a feature of Xen 2.0 but that capability <para>PCI delegation was a feature of Xen 2.0 but that capability
was dropped in 3.0. It has been restored in Xen 3.0.2 and once I was dropped in 3.0. It has been restored in Xen 3.0.2 and once I
upgrade this system to SuSE 10.1 (which includes Xen 3.0.2), I upgrade this system to SUSE 10.1 (which includes Xen 3.0.2), I
intend to implement PCI delegation and remove three of the four intend to implement PCI delegation and remove three of the four
bridges. I will probably combine the wireless and firewall domains bridges. I will probably combine the wireless and firewall domains
at that time as well.</para> at that time as well.</para>
@ -442,7 +442,7 @@ SECTION NEW
attached wirelessly, the IP address is assigned by OpenVPN.</para> attached wirelessly, the IP address is assigned by OpenVPN.</para>
<para>The Shorewall configuration files are shown below. All routing and <para>The Shorewall configuration files are shown below. All routing and
secondary IP addresses are handled in the SuSE network secondary IP addresses are handled in the SUSE network
configuration.</para> configuration.</para>
<blockquote> <blockquote>
@ -630,7 +630,7 @@ ACCEPT loc fw tcp
ACCEPT loc fw tcp time,631,8080 ACCEPT loc fw tcp time,631,8080
ACCEPT loc fw udp 161,ntp,631 ACCEPT loc fw udp 161,ntp,631
ACCEPT loc:192.168.1.5 fw udp 111 ACCEPT loc:192.168.1.5 fw udp 111
DROP loc fw tcp 3185 #SuSE Meta pppd DROP loc fw tcp 3185 #SUSE Meta pppd
Ping/ACCEPT loc fw Ping/ACCEPT loc fw
REDIRECT loc 3128 tcp 80 - !206.124.146.177 REDIRECT loc 3128 tcp 80 - !206.124.146.177
############################################################################################################################################################################### ###############################################################################################################################################################################
@ -814,7 +814,7 @@ $EXT_IF 30 6*full/10 6*full/10 3
<graphic align="center" fileref="images/Xen6.png" /> <graphic align="center" fileref="images/Xen6.png" />
<para>The 'tap0' device used by OpenVPN is bridged to eth2 using this <para>The 'tap0' device used by OpenVPN is bridged to eth2 using this
SuSE-specific startup script (see the <ulink url="bridge.html">Shorewall SUSE-specific startup script (see the <ulink url="bridge.html">Shorewall
Bridge Documentation</ulink> for scripts that work on other Bridge Documentation</ulink> for scripts that work on other
distributions):</para> distributions):</para>
@ -925,7 +925,7 @@ get_interfaces() {
INTERFACES="$interfaces" INTERFACES="$interfaces"
} }
################################################################################ ################################################################################
# Configure the Bridge -- IP configuration is left to the SuSE network scripts # Configure the Bridge -- IP configuration is left to the SUSE network scripts
################################################################################ ################################################################################
do_start() do_start()
{ {
@ -991,7 +991,7 @@ case "$command" in
esac</programlisting> esac</programlisting>
<para>As mentioned in the comments in the above script, IP <para>As mentioned in the comments in the above script, IP
configuration of the bridge is done through the normal SuSE network configuration of the bridge is done through the normal SUSE network
scripts. Here's the config file:</para> scripts. Here's the config file:</para>
<programlisting>BOOTPROTO='static' <programlisting>BOOTPROTO='static'
@ -1069,7 +1069,7 @@ default via 192.168.1.254 dev br0</programlisting>
</blockquote> </blockquote>
<para>The route to 169.254.0.0/16 is automatically generated by the <para>The route to 169.254.0.0/16 is automatically generated by the
SuSE network scripts so I include that network in the SUSE network scripts so I include that network in the
<filename>/etc/shorewall/maclist</filename> file for <filename>/etc/shorewall/maclist</filename> file for
completeness.</para> completeness.</para>
@ -1172,4 +1172,4 @@ verb 3</programlisting>
</blockquote> </blockquote>
</section> </section>
</section> </section>
</article> </article>

8
docs/bridge.xml
View File

@ -239,10 +239,10 @@ BOOTPROTO=dhcp
ONBOOT=yes</programlisting> ONBOOT=yes</programlisting>
</blockquote> </blockquote>
<para>On both the SUSE and Mandriva systems, a separate script is required <para>On both the <trademark>SUSE</trademark> and Mandriva systems,
to configure the bridge itself.</para> a separate script is required to configure the bridge itself.</para>
<para>Here are scripts that I used on a <trademark>Suse</trademark> 9.1 <para>Here are scripts that I used on a <trademark>SUSE</trademark> 9.1
system.</para> system.</para>
<blockquote> <blockquote>
@ -607,4 +607,4 @@ dmz br0:eth2</programlisting>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</article> </article>

14
docs/myfiles.xml
View File

@ -66,20 +66,20 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>I use one-to-one NAT for <emphasis>"Ursa"</emphasis> (my <para>I use one-to-one NAT for <emphasis>"Ursa"</emphasis> (my
personal system that run SuSE 10.0) - Internal address 192.168.1.5 and personal system that run SUSE 10.0) - Internal address 192.168.1.5 and
external address 206.124.146.178.</para> external address 206.124.146.178.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>I use one-to-one NAT for "<emphasis>lists</emphasis>" (My server <para>I use one-to-one NAT for "<emphasis>lists</emphasis>" (My server
system that runs SuSE 10.0 in a Xen virtual system on system that runs SUSE 10.0 in a Xen virtual system on
<emphasis>ursa</emphasis>) - Internal address 192.168.1.7 and external <emphasis>ursa</emphasis>) - Internal address 192.168.1.7 and external
address 206.124.146.177.</para> address 206.124.146.177.</para>
</listitem> </listitem>
<listitem> <listitem>
<para>I use one-to-one NAT for <emphasis>"Eastepnc6000</emphasis>" (My <para>I use one-to-one NAT for <emphasis>"Eastepnc6000</emphasis>" (My
work system -- Windows XP SP1/SuSE 10.0). Internal address 192.168.1.6 work system -- Windows XP SP1/SUSE 10.0). Internal address 192.168.1.6
and external address 206.124.146.180.</para> and external address 206.124.146.180.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
@ -93,7 +93,7 @@
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>The firewall runs on a Celeron 1.4Ghz under SuSE 10.0.</para> <para>The firewall runs on a Celeron 1.4Ghz under SUSE 10.0.</para>
<para><emphasis>Ursa</emphasis> runs Samba for file sharing with the <para><emphasis>Ursa</emphasis> runs Samba for file sharing with the
Windows systems and is configured as a Wins server.</para> Windows systems and is configured as a Wins server.</para>
@ -122,7 +122,7 @@
of the laptops. The server also has a desktop environment installed but it of the laptops. The server also has a desktop environment installed but it
is never started. For the most part, X tunneled through SSH is used for is never started. For the most part, X tunneled through SSH is used for
server administration and the server runs at run level 3 (multi-user server administration and the server runs at run level 3 (multi-user
console mode on SuSE).</para> console mode on SUSE).</para>
<para>In addition to the OpenVPN bridge, the firewall hosts an OpenVPN <para>In addition to the OpenVPN bridge, the firewall hosts an OpenVPN
Tunnel server for VPN access from our second home in <ulink Tunnel server for VPN access from our second home in <ulink
@ -497,7 +497,7 @@ Limit:$LOG:SSHA,3,60\
ACCEPT loc fw tcp time,631,8080 ACCEPT loc fw tcp time,631,8080
ACCEPT loc fw udp 161,ntp,631 ACCEPT loc fw udp 161,ntp,631
ACCEPT loc:192.168.1.5 fw udp 111 ACCEPT loc:192.168.1.5 fw udp 111
DROP loc fw tcp 3185 #SuSE Meta pppd DROP loc fw tcp 3185 #SUSE Meta pppd
Ping/ACCEPT loc fw Ping/ACCEPT loc fw
############################################################################################################################################################################### ###############################################################################################################################################################################
# Local Network to Wireless # Local Network to Wireless
@ -933,4 +933,4 @@ ip route add 206.124.146.177/32 via $5 #So that DNS names will resolve in my
</blockquote> </blockquote>
</section> </section>
</section> </section>
</article> </article>

4
docs/upgrade_issues.xml
View File

@ -753,7 +753,7 @@ DNAT loc loc:192.168.1.12 tcp 80 - 130.252.100.69</p
<listitem> <listitem>
<para>If your kernel has IPV6 support (recent <para>If your kernel has IPV6 support (recent
<trademark>SuSe</trademark> for example), and you don't use IPV6 then <trademark>SUSE</trademark> for example), and you don't use IPV6 then
you will probably want to set DISABLE_IPV6=Yes in <ulink you will probably want to set DISABLE_IPV6=Yes in <ulink
url="Documentation.htm#Conf">/etc/shorewall/shorewall.conf</ulink>. url="Documentation.htm#Conf">/etc/shorewall/shorewall.conf</ulink>.
You must have ipv6tables installed.</para> You must have ipv6tables installed.</para>
@ -1082,4 +1082,4 @@ error: failed dependencies:iproute is needed by shorewall-1.4.0-1
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</article> </article>

2
web/download.htm
View File

@ -271,7 +271,7 @@ Marc Zonzon:
<br> <br>
Use Use
the sites below to download the<b>tarball</b>, the <b>documentation</b> the sites below to download the<b>tarball</b>, the <b>documentation</b>
and the <b>standard RPM</b> for (<b>Suse</b>, <b>Power PPC</b>, and the <b>standard RPM</b> for (<b>SUSE</b>, <b>Power PPC</b>,
<b>Trustix</b> and <b>TurboLinux</b>).<br> <b>Trustix</b> and <b>TurboLinux</b>).<br>
<br> <br>
Packages are GPG Packages are GPG

2
web/oldnews.html
View File

@ -2363,7 +2363,7 @@ loc Local Extended local zone
available<br> available<br>
</span> <br> </span> <br>
Simon Matter has graciously volunteered to provide RPMs Simon Matter has graciously volunteered to provide RPMs
taylored for Redhat and Fedora. You can download Simon's RPMs tailored for Redhat and Fedora. You can download Simon's RPMs
from <a target="_top" href= from <a target="_top" href=
"http://www.invoca.ch/pub/packages/shorewall/">http://www.invoca.ch/pub/packages/shorewall/</a><br> "http://www.invoca.ch/pub/packages/shorewall/">http://www.invoca.ch/pub/packages/shorewall/</a><br>