summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRobert Göhler <github@ghlr.de>2024-03-05 21:38:12 +0100
committerGitHub <noreply@github.com>2024-03-05 21:38:12 +0100
commit26d5585bf8e776620db6db1c4b4092efd7364376 (patch)
tree1de8af6be3dc77217531e4687c8b9043ae4ef269 /docs
parentfb9775d57115770a74c0722d6cc5e8ed501dada2 (diff)
downloadvyos-documentation-26d5585bf8e776620db6db1c4b4092efd7364376.tar.gz
vyos-documentation-26d5585bf8e776620db6db1c4b4092efd7364376.zip
Update sstp.rst
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration/vpn/sstp.rst12
1 files changed, 0 insertions, 12 deletions
diff --git a/docs/configuration/vpn/sstp.rst b/docs/configuration/vpn/sstp.rst
index b9caa1b3..3749eb7b 100644
--- a/docs/configuration/vpn/sstp.rst
+++ b/docs/configuration/vpn/sstp.rst
@@ -274,22 +274,10 @@ IPv6
.. code-block:: none
-<<<<<<< HEAD
- set vpn sstp authentication local-users username vyos password vyos
- set vpn sstp authentication mode local
- set vpn sstp gateway-address 192.0.2.254
- set vpn sstp client-ip-pool subnet 192.0.2.0/25
- set vpn sstp name-server 10.0.0.1
- set vpn sstp name-server 10.0.0.2
- set vpn sstp ssl ca-cert-file /config/auth/ca.crt
- set vpn sstp ssl cert-file /config/auth/server.crt
- set vpn sstp ssl key-file /config/auth/server.key
-=======
set vpn sstp ppp-options ipv6 allow
set vpn sstp client-ipv6-pool IPv6-POOL delegate '2001:db8:8003::/48' delegation-prefix '56'
set vpn sstp client-ipv6-pool IPV6-POOL prefix '2001:db8:8002::/48' mask '64'
set vpn sstp default-ipv6-pool IPv6-POOL
->>>>>>> d71c4607 (Rewritten the SSTP server documentation)
IPv6 Advanced Options
=====================