From 51bbc1853ca76594bf14d85da9feb57ad95c54f9 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 12 Nov 2018 20:33:40 +0100
Subject: T987: Unclutter PPTP/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 pptp
 remote-access {
     authentication {
         mode radius
         radius-server 172.16.100.10 {
             key barbarbar
         }
         radius-server 172.16.100.20 {
             key foofoofoo
         }
     }

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
             }
         }
     }

(cherry picked from commit 4a5db8a416fc6126a504bc3a9f1b5f6de84e119d)
---
 Makefile.am        | 2 +-
 cfg-version/pptp@1 | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 cfg-version/pptp@1

diff --git a/Makefile.am b/Makefile.am
index 08210fbf..c4a4e1b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,7 +124,7 @@ 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
-
+curver_DATA += cfg-version/pptp@1
 
 cpiop = find  . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
   cpio -0pd
diff --git a/cfg-version/pptp@1 b/cfg-version/pptp@1
new file mode 100644
index 00000000..e69de29b
-- 
cgit v1.2.3