diff --git a/Shorewall-docs2/FAQ.xml b/Shorewall-docs2/FAQ.xml index 2718d5fe9..166276233 100644 --- a/Shorewall-docs2/FAQ.xml +++ b/Shorewall-docs2/FAQ.xml @@ -17,7 +17,7 @@ - 2005-10-01 + 2005-10-25 2001-2005 @@ -162,13 +162,14 @@ DNAT net loc:<local IP address>[:< - You are running Mandrake Linux and have configured Internet - Connection Sharing. In that case, the name of your local zone is - 'masq' rather than 'loc' (change all instances of 'loc' to 'masq' - in your rules). You may want to consider re-installing Shorewall - in a configuration which matches the Shorewall documentation. See - the two-interface QuickStart - Guide for details. + You are running Mandrake Linux prior to 10.0 final and have + configured Internet Connection Sharing. In that case, the name of + your local zone is 'masq' rather than 'loc' (change all instances + of 'loc' to 'masq' in your rules). You may want to consider + re-installing Shorewall in a configuration which matches the + Shorewall documentation. See the two-interface QuickStart Guide for + details. diff --git a/Shorewall-docs2/OPENVPN.xml b/Shorewall-docs2/OPENVPN.xml index 136576e39..05f8ace15 100644 --- a/Shorewall-docs2/OPENVPN.xml +++ b/Shorewall-docs2/OPENVPN.xml @@ -450,7 +450,7 @@ verb 3 in the 192.168.3.0/24 network connected to the firewall's eth0 interface which places them in the firewall's Wifi zone. OpenVPN bridging - allows them to be assigned an additional temporary IP address from the + allows them to be assigned an additional IP address from the 192.168.1.0/24 network and to be securely bridged to the LAN on the lower left. diff --git a/Shorewall-docs2/myfiles.xml b/Shorewall-docs2/myfiles.xml index 9e61de11d..42309304b 100644 --- a/Shorewall-docs2/myfiles.xml +++ b/Shorewall-docs2/myfiles.xml @@ -744,7 +744,6 @@ iface eth2 inet static up ip route add 192.168.1.1 dev eth2 # Wireless network - auto eth0 iface eth0 inet static address 192.168.3.254 @@ -767,15 +766,13 @@ iface br0 inet static post-down /usr/sbin/brctl delbr br0 post-down /usr/sbin/openvpn --rmtun --dev tap0 -# Unbrided LAN interface - +# Unbridged LAN interface (Not started automatically) iface eth3 inet static address 192.168.1.254 netmask 255.255.255.0 up ip route add 224.0.0.0/4 dev eth3 -# Second Internet interface - +# Second Internet interface (Not started automatically -- address is duplicate of one added by Shorewall to eth2) iface eth4 inet static pre-up modprobe ne io=0x300 irq=10 address 206.124.146.179