From 314b4ffd36e66dd8e55525ad01638c4894f098a1 Mon Sep 17 00:00:00 2001 From: teastep Date: Sat, 1 Oct 2005 00:36:17 +0000 Subject: [PATCH] Remove hacks done to align columns in programlistings git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2765 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-docs2/VPNBasics.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Shorewall-docs2/VPNBasics.xml b/Shorewall-docs2/VPNBasics.xml index 650baa4cc..67e529e68 100644 --- a/Shorewall-docs2/VPNBasics.xml +++ b/Shorewall-docs2/VPNBasics.xml @@ -15,7 +15,7 @@ - 2005-08-27 + 2005-09-30 2004 @@ -194,14 +194,14 @@ #ZONE DISPLAY COMMENT net Internet The big bad net loc Local Local LAN -rem Remote Remote LAN +rem Remote Remote LAN /etc/shorewall/interfaces: #ZONE INTERFACE BROADCAST OPTION net eth0 detect norft1918,routefilter loc eth1 detect -rem tun0 192.168.10.0/24 +rem tun0 192.168.10.0/24 The /etc/shorewall/hosts file comes into play when: @@ -230,21 +230,21 @@ loc eth1 detect #ZONE DISPLAY COMMENT net Internet The big bad net loc Local Local LAN -rem1 Remote1 Remote LAN 1 -rem2 Remote2 Remote LAN 2 +rem1 Remote1 Remote LAN 1 +rem2 Remote2 Remote LAN 2 /etc/shorewall/interfaces: #ZONE INTERFACE BROADCAST OPTION net eth0 detect norft1918,routefilter loc eth1 detect -- tun+ - +- tun+ - /etc/shorewall/hosts: #ZONE HOST(S) OPTIONS -rem1 tun+:10.0.0.0/24 -rem2 tun+:10.0.1.0/24 +rem1 tun+:10.0.0.0/24 +rem2 tun+:10.0.1.0/24 The /etc/shorewall/hosts file is also used with kernel 2.6 native IPSEC.