summaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
Diffstat (limited to 'docs/configuration')
-rw-r--r--docs/configuration/interfaces/tunnel.rst15
-rw-r--r--docs/configuration/service/pppoe-server.rst1
-rw-r--r--docs/configuration/system/name-server.rst2
3 files changed, 18 insertions, 0 deletions
diff --git a/docs/configuration/interfaces/tunnel.rst b/docs/configuration/interfaces/tunnel.rst
index 36b1d70b..7f7cd709 100644
--- a/docs/configuration/interfaces/tunnel.rst
+++ b/docs/configuration/interfaces/tunnel.rst
@@ -201,6 +201,21 @@ An example:
set interfaces tunnel tun0 address 172.16.17.18/24
set interfaces tunnel tun0 parameters ip key 20
+GRETAP
+^^^^^^^
+
+While normal GRE is for layer 3, GRETAP is for layer 2. GRETAP can encapsulate
+Ethernet frames, thus it can be bridged with other interfaces to create
+datalink layer segments that span multiple remote sites.
+
+.. code-block:: none
+
+ set interfaces bridge br0 member interface eth0
+ set interfaces bridge br0 member interface tun0
+ set interfaces tunnel tun0 encapsulation gretap
+ set interfaces tunnel tun0 source-address 198.51.100.2
+ set interfaces tunnel tun0 remote 203.0.113.10
+
Troubleshooting
^^^^^^^^^^^^^^^
diff --git a/docs/configuration/service/pppoe-server.rst b/docs/configuration/service/pppoe-server.rst
index 8d895f9d..ad99cec0 100644
--- a/docs/configuration/service/pppoe-server.rst
+++ b/docs/configuration/service/pppoe-server.rst
@@ -388,6 +388,7 @@ The example below covers a dual-stack configuration via pppoe-server.
set service pppoe-server client-ip-pool stop '192.168.0.10'
set service pppoe-server client-ipv6-pool delegate '2001:db8:8003::/48' delegation-prefix '56'
set service pppoe-server client-ipv6-pool prefix '2001:db8:8002::/48' mask '64'
+ set service pppoe-server ppp-options ipv6 allow
set service pppoe-server name-server '10.1.1.1'
set service pppoe-server name-server '2001:db8:4860::8888'
set service pppoe-server interface 'eth2'
diff --git a/docs/configuration/system/name-server.rst b/docs/configuration/system/name-server.rst
index 1896eeda..c105c712 100644
--- a/docs/configuration/system/name-server.rst
+++ b/docs/configuration/system/name-server.rst
@@ -4,6 +4,8 @@
System DNS
##########
+.. warning:: If you are configuring a VRF for management purposes, there is
+ currently no way to force system DNS traffic via a specific VRF.
This section describes configuring DNS on the system, namely: