diff --git a/docs/GenericTunnels.xml b/docs/GenericTunnels.xml
index 425c3b95f..83427e02c 100644
--- a/docs/GenericTunnels.xml
+++ b/docs/GenericTunnels.xml
@@ -50,7 +50,7 @@
Suppose that we have the following situation:
- ![]()
+ ![]()
We want systems in the 192.168.1.0/24 subnetwork to be able to
communicate with the systems in the 10.0.0.0/8 network. This is
@@ -91,7 +91,7 @@ vpn tun0 10.255.255.255
In /etc/shorewall/tunnels on system A, we need the following:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
generic:tcp:1071 net 134.28.54.2
generic:47 net 134.28.54.2
@@ -104,7 +104,7 @@ vpn tun0 192.168.1.255
In /etc/shorewall/tunnels on system B, we have:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
generic:tcp:1071 net 206.191.148.9
generic:47 net 206.191.148.9
diff --git a/docs/IPIP.xml b/docs/IPIP.xml
index 5a6c3c033..3982b1e2d 100644
--- a/docs/IPIP.xml
+++ b/docs/IPIP.xml
@@ -108,7 +108,7 @@ vpn tosysb
In /etc/shorewall/tunnels on system A, we need the following:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
ipip net 134.28.54.2
This entry in /etc/shorewall/tunnels, opens the firewall so that the
@@ -138,7 +138,7 @@ vpn tosysa
In /etc/shorewall/tunnels on system B, we have:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
ipip net 206.191.148.9
And in the tunnel script on system B:
diff --git a/docs/IPSEC-2.6.xml b/docs/IPSEC-2.6.xml
index decc79c75..876b4883e 100644
--- a/docs/IPSEC-2.6.xml
+++ b/docs/IPSEC-2.6.xml
@@ -267,14 +267,14 @@
/etc/shorewall/tunnels —
System A:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
ipsec net 134.28.54.2
#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE
/etc/shorewall/tunnels —
System B:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
ipsec net 206.162.148.9
#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE
@@ -502,13 +502,13 @@ loc ipv4
but that cannot be determined in advance. In the
/etc/shorewall/tunnels file on system A, the
following entry should be made:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
ipsec net 0.0.0.0/0 vpn
#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE
- the GATEWAY ZONE column contains the name of the zone
+ the GATEWAY_ZONE column contains the name of the zone
corresponding to peer subnetworks. This indicates that the gateway
system itself comprises the peer subnetwork; in other words, the
remote gateway is a standalone system.
@@ -541,7 +541,7 @@ loc ipv4
/etc/shorewall/tunnels - System B:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
ipsec net 206.162.148.9 vpn
#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE
diff --git a/docs/OPENVPN.xml b/docs/OPENVPN.xml
index 31c9ed204..f6f6b102d 100644
--- a/docs/OPENVPN.xml
+++ b/docs/OPENVPN.xml
@@ -137,7 +137,7 @@ vpn tun0
the following:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpn net 134.28.54.2
@@ -149,7 +149,7 @@ openvpn net 134.28.54.2
/etc/shorewall/tunnels with port 7777:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpn:7777 net 134.28.54.2
@@ -160,7 +160,7 @@ openvpn:7777 net 134.28.54.2
/etc/shorewall/tunnels using TCP:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpn:tcp net 134.28.54.2
@@ -169,7 +169,7 @@ openvpn:tcp net 134.28.54.2
/etc/shorewall/tunnels using TCP port 7777:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpn:tcp:7777 net 134.28.54.2
@@ -205,7 +205,7 @@ vpn tun0
have:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpn net 206.191.148.9
@@ -275,7 +275,7 @@ road tun+
the following:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpn:1194 net 0.0.0.0/0
@@ -286,7 +286,7 @@ openvpn:1194 net 0.0.0.0/0
uses NAT.
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpnserver:1194 net 0.0.0.0/0
@@ -361,7 +361,7 @@ home tun0
the following:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpn:1194 net 206.162.148.9
@@ -370,7 +370,7 @@ openvpn:1194 net 206.162.148.9
prefer:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpnclient:1194 net 206.162.148.9
@@ -717,7 +717,7 @@ TUNNEL_IF=gif0
Add this entry to /etc/shorewall/tunnels:
- #TYPE ZONE GATEWAY GATEWAY ZONE
+ #TYPE ZONE GATEWAY GATEWAY_ZONE
openvpnserver:1194 net 0.0.0.0/0