From a8084370b6dadb69fd3c5cff1b85e9166b761ab2 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 5 Jan 2011 06:57:42 -0800 Subject: [PATCH] Correct bridge example in the OPENVPN doc --- docs/OPENVPN.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/OPENVPN.xml b/docs/OPENVPN.xml index f38832800..ea155a297 100644 --- a/docs/OPENVPN.xml +++ b/docs/OPENVPN.xml @@ -764,7 +764,7 @@ secret /etc/openvpn/bridgekey iface br0 inet static pre-up /usr/sbin/openvpn --mktun --dev tap0 - pre-up /usr/sbin/brctl addbr br1 + pre-up /usr/sbin/brctl addbr br0 address 192.168.1.254 network 192.168.1.0 broadcast 192.168.1.255 @@ -774,14 +774,14 @@ secret /etc/openvpn/bridgekey post-up /sbin/ip link set eth1 up post-up /usr/sbin/brctl addif br0 eth1 post-down /usr/sbin/brctl delbr br0 - post-down /usr/sbin/tunctl -d tap0 + post-down /usr/sbin/openvpn --rmtun tap0 post-down /sbin/ip link set eth1 down /etc/network/interfaces on the right-hand firewall: iface br0 inet static pre-up /usr/sbin/openvpn --mktun --dev tap0 - pre-up /usr/sbin/brctl addbr br1 + pre-up /usr/sbin/brctl addbr br0 address 192.168.1.253 network 192.168.1.0 broadcast 192.168.1.255 @@ -791,7 +791,7 @@ secret /etc/openvpn/bridgekey post-up /sbin/ip link set eth1 up post-up /usr/sbin/brctl addif br0 eth1 post-down /usr/sbin/brctl delbr br0 - post-down /usr/sbin/tunctl -d tap0 + post-down /usr/sbin/openvpn --rmtun tap0 post-down /sbin/ip link set eth1 down The Shorewall configuration is just a