summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAnthony Ruhier <anthony.ruhier@gmail.com>2015-01-11 19:47:17 +0100
committerJouke Witteveen <j.witteveen@gmail.com>2015-01-12 22:08:40 +0100
commitcf675b4ab8e56267b56e2d8bc2a30f87f3502abb (patch)
tree23d7d04962caa8cd121bf2bb5694b43bc9edd014 /docs
parent0cc69f13c2355831e8f07962c072c09ca35fd5f3 (diff)
downloadnetctl-cf675b4ab8e56267b56e2d8bc2a30f87f3502abb.tar.gz
netctl-cf675b4ab8e56267b56e2d8bc2a30f87f3502abb.tar.xz
Add support for keys to tunnel connections
Only relevant for GRE tunneling.
Diffstat (limited to 'docs')
-rw-r--r--docs/examples/tunnel (renamed from docs/examples/tunnel-he-ipv6)9
-rw-r--r--docs/netctl.profile.5.txt3
2 files changed, 9 insertions, 3 deletions
diff --git a/docs/examples/tunnel-he-ipv6 b/docs/examples/tunnel
index 2a19406..feb3976 100644
--- a/docs/examples/tunnel-he-ipv6
+++ b/docs/examples/tunnel
@@ -1,10 +1,13 @@
-Description='An example ipv6 tunnel with Hurricane Electric'
-Interface=he-ipv6
+Description='Example tunnel connection'
+Interface=tun-ipv6
Connection=tunnel
-Mode='sit'
+Mode=sit
Remote='216.66.80.26'
#Local='172.16.0.1'
+## Optional key in case of Mode=gre
+#Key=1234
+
IP6=static
Address6='2001:470:1f08:d87::2/64'
Routes6=('::/0')
diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt
index 82946da..212bbb7 100644
--- a/docs/netctl.profile.5.txt
+++ b/docs/netctl.profile.5.txt
@@ -461,6 +461,9 @@ the *ip options*, the following are understood for connections of the
'Remote='::
The address of the remote end of the tunnel.
+'Key=' [requires 'Mode=gre']::
+ A key identifying an individual traffic flow within a tunnel.
+
OPTIONS FOR `tuntap' CONNECTIONS
--------------------------------