From 8041569f14fd548ee3d48a9fbdc408e8543ca2f9 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sun, 10 Oct 2010 08:28:38 -0700
Subject: [PATCH] Revise Vserver article

---
 docs/Vserver.xml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/Vserver.xml b/docs/Vserver.xml
index d1d234391..46ebccdb4 100644
--- a/docs/Vserver.xml
+++ b/docs/Vserver.xml
@@ -114,7 +114,7 @@ gateway:~#</programlisting>
   <section>
     <title>Vserver Zones</title>
 
-    <para>Here is a diagram of the network configuration here at Shorewall.net
+    <para>This is a diagram of the network configuration here at Shorewall.net
     during the summer of 2010:</para>
 
     <graphic align="center" fileref="images/Network2010a.png" />
@@ -131,6 +131,12 @@ net             ipv4            #Internet
 vpn             ipv4            #OpenVPN clients
 <emphasis role="bold">dmz             vserver         #Vservers</emphasis></programlisting>
 
+    <para><filename>/etc/shorewall/interfaces</filename>:</para>
+
+    <programlisting>#ZONE   INTERFACE     BROADCAST           OPTIONS
+<emphasis role="bold">net     eth1          detect              dhcp,optional,routefilter=0,logmartians,proxyarp=0,nosmurfs,upnp</emphasis>
+...</programlisting>
+
     <para><filename>/etc/shorewall/hosts</filename>:</para>
 
     <programlisting>#ZONE   HOST(S)                                 OPTIONS
@@ -160,10 +166,16 @@ vpn	ipv6
 <emphasis role="bold">dmz	vserver</emphasis>
 </programlisting>
 
+    <para><filename>/etc/shorewall6/interfaces</filename>:</para>
+
+    <programlisting>#ZONE   INTERFACE     BROADCAST           OPTIONS
+<emphasis role="bold">net     sit1          detect              tcpflags,forward=1,nosmurfs,routeback</emphasis>
+...</programlisting>
+
     <para><filename>/etc/shorewall6/hosts</filename>:</para>
 
     <programlisting>#ZONE   HOST(S)                                 OPTIONS
-dmz	sit1:[2001:470:e857:1::/64]</programlisting>
+<emphasis role="bold">dmz     sit1:[2001:470:e857:1::/64]</emphasis></programlisting>
 
     <para>Note that I choose to place the Vservers on sit1 (the IPv6 net
     interface) rather than on eth1. Again, it really doesn't matter