From f68dda9d619ea74bed266122ac86604284e1a9e4 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 11 Nov 2018 17:33:36 +0100 Subject: T987: Unclutter L2TP/IPSec RADIUS configuration nodes In other words, remove top level tag nodes from radius-server and introduce a regular "radius" node, thus we can add additional features, too. A migration script is provided in vyos-1x which takes care of this config migration. Change VyOS CLI from: vyos@vyos# show vpn l2tp remote-access { authentication { mode radius radius-server 172.16.100.10 { key barbarbar } radius-server 172.16.100.20 { key foofoofoo } radius-source-address 172.16.254.100 } To: vyos@vyos# show vpn l2tp remote-access { authentication { mode radius radius { server 172.16.100.10 { key barbarbar } server 172.16.100.20 { key foofoofoo } source-address 172.16.254.100 } } --- Makefile.am | 2 ++ cfg-version/l2tp@1 | 0 2 files changed, 2 insertions(+) create mode 100644 cfg-version/l2tp@1 diff --git a/Makefile.am b/Makefile.am index d09fdb83..08210fbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,6 +123,8 @@ curver_DATA += cfg-version/mdns@1 curver_DATA += cfg-version/dhcp-server@5 curver_DATA += cfg-version/dhcp-relay@2 curver_DATA += cfg-version/ssh@1 +curver_DATA += cfg-version/l2tp@1 + cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd diff --git a/cfg-version/l2tp@1 b/cfg-version/l2tp@1 new file mode 100644 index 00000000..e69de29b -- cgit v1.2.3