Merge branch 't2264-l2tp' of github.com:c-po/vyos-1x into current

* 't2264-l2tp' of github.com:c-po/vyos-1x: (25 commits)
  vpn: l2tp: sstp: T2264: create config dir on demand
  vpn: l2tp: T2264: migrate IPv6 prefix node to common CLI style
  vpn: l2tp: T2264: simplify IPv6 config dictionary elements
  vpn: sstp: T2008: migrate from SysVinit -> systemd
  vpn: sstp: T2008: bugfix KeyError 'client_gateway'
  vpn: l2tp: T2264: migrate from SysVinit -> systemd
  vpn: l2tp: T2264: remove debug pprint
  vpn: l2tp: T2264: proper set PPP default values to ease Jinja2 template
  vpn: l2tp: T2110: re-use RADIUS XML include file
  vpn: l2tp: T2264: remove RADIUS req-limit node
  vpn: l2tp: T2264: migrate to new dictionary keys for radius auth
  vpn: sstp: T2008: set accell default values in config dict
  vpn: l2tp: T2264: use "with open()" when writing config
  vpn: l2tp: T2264: migrate to new dictionary keys for local auth
  vpn: sstp: T2008: improve error message for non existent local-users
  vpn: l2tp: T2264: cleanup thread_cnt generation
  vpn: sstp: T2008: cleanup thread_cnt generation
  vpn: l2tp: T2264: combine WINS CLI syntax
  vpn: l2tp: T2264: combine IPv4/IPv6 name-server CLI syntax
  vpn: sstp: T2008: adjust DNS error message
  ...

6 files changed, 569 insertions, 477 deletions

diff --git a/src/conf_mode/accel_l2tp.py b/src/conf_mode/accel_l2tp.py
deleted file mode 100755
index 4ca5a858a..000000000
--- a/src/conf_mode/accel_l2tp.py
+++ /dev/null
@@ -1,397 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2019-2020 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-import os
-import re
-import jinja2
-import socket
-import time
-
-from jinja2 import FileSystemLoader, Environment
-
-from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
-from vyos import ConfigError
-from vyos.util import run
-
-
-pidfile = r'/var/run/accel_l2tp.pid'
-l2tp_cnf_dir = r'/etc/accel-ppp/l2tp'
-chap_secrets = l2tp_cnf_dir + '/chap-secrets'
-l2tp_conf = l2tp_cnf_dir + '/l2tp.config'
-# accel-pppd -d -c /etc/accel-ppp/l2tp/l2tp.config -p /var/run/accel_l2tp.pid
-
-# config path creation
-if not os.path.exists(l2tp_cnf_dir):
-    os.makedirs(l2tp_cnf_dir)
-
-###
-# inline helper functions
-###
-# depending on hw and threads, daemon needs a little to start
-# if it takes longer than 100 * 0.5 secs, exception is being raised
-# not sure if that's the best way to check it, but it worked so far quite well
-###
-
-
-def chk_con():
-    cnt = 0
-    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    while True:
-        try:
-            s.connect(("127.0.0.1", 2004))
-            break
-        except ConnectionRefusedError:
-            time.sleep(0.5)
-            cnt += 1
-            if cnt == 100:
-                raise("failed to start l2tp server")
-                break
-
-
-def _accel_cmd(command):
-  return run(f'/usr/bin/accel-cmd -p 2004 {command}')
-
-### 
-# inline helper functions end
-###
-
-
-def get_config():
-    c = Config()
-    if not c.exists('vpn l2tp remote-access '):
-        return None
-
-    c.set_level('vpn l2tp remote-access')
-    config_data = {
-        'authentication': {
-            'mode': 'local',
-            'local-users': {
-            },
-            'radiussrv': {},
-            'radiusopt': {},
-            'auth_proto': [],
-            'mppe': 'prefer'
-        },
-        'outside_addr': '',
-        'gateway_address': '10.255.255.0',
-        'dns': [],
-        'dnsv6': [],
-        'wins': [],
-        'client_ip_pool': None,
-        'client_ip_subnets': [],
-        'client_ipv6_pool': {},
-        'mtu': '1436',
-        'ip6_column': '',
-        'ip6_dp_column': '',
-        'ppp_options': {},
-    }
-
-    ### general options ###
-
-    if c.exists('dns-servers server-1'):
-        config_data['dns'].append(c.return_value('dns-servers server-1'))
-    if c.exists('dns-servers server-2'):
-        config_data['dns'].append(c.return_value('dns-servers server-2'))
-    if c.exists('dnsv6-servers'):
-        for dns6_server in c.return_values('dnsv6-servers'):
-            config_data['dnsv6'].append(dns6_server)
-    if c.exists('wins-servers server-1'):
-        config_data['wins'].append(c.return_value('wins-servers server-1'))
-    if c.exists('wins-servers server-2'):
-        config_data['wins'].append(c.return_value('wins-servers server-2'))
-    if c.exists('outside-address'):
-        config_data['outside_addr'] = c.return_value('outside-address')
-
-    # auth local
-    if c.exists('authentication mode local'):
-        if c.exists('authentication local-users username'):
-            for usr in c.list_nodes('authentication local-users username'):
-                config_data['authentication']['local-users'].update(
-                    {
-                        usr: {
-                            'passwd': '',
-                            'state': 'enabled',
-                            'ip': '*',
-                            'upload': None,
-                            'download': None
-                        }
-                    }
-                )
-
-                if c.exists('authentication local-users username ' + usr + ' password'):
-                    config_data['authentication']['local-users'][usr]['passwd'] = c.return_value(
-                        'authentication local-users username ' + usr + ' password')
-                if c.exists('authentication local-users username ' + usr + ' disable'):
-                    config_data['authentication']['local-users'][usr]['state'] = 'disable'
-                if c.exists('authentication local-users username ' + usr + ' static-ip'):
-                    config_data['authentication']['local-users'][usr]['ip'] = c.return_value(
-                        'authentication local-users username ' + usr + ' static-ip')
-                if c.exists('authentication local-users username ' + usr + ' rate-limit download'):
-                    config_data['authentication']['local-users'][usr]['download'] = c.return_value(
-                        'authentication local-users username ' + usr + ' rate-limit download')
-                if c.exists('authentication local-users username ' + usr + ' rate-limit upload'):
-                    config_data['authentication']['local-users'][usr]['upload'] = c.return_value(
-                        'authentication local-users username ' + usr + ' rate-limit upload')
-
-    # authentication mode radius servers and settings
-
-    if c.exists('authentication mode radius'):
-        config_data['authentication']['mode'] = 'radius'
-        rsrvs = c.list_nodes('authentication radius server')
-        for rsrv in rsrvs:
-            if c.return_value('authentication radius server ' + rsrv + ' fail-time') == None:
-                ftime = '0'
-            else:
-                ftime = str(c.return_value(
-                    'authentication radius server ' + rsrv + ' fail-time'))
-            if c.return_value('authentication radius-server ' + rsrv + ' req-limit') == None:
-                reql = '0'
-            else:
-                reql = str(c.return_value(
-                    'authentication radius server ' + rsrv + ' req-limit'))
-
-            config_data['authentication']['radiussrv'].update(
-                {
-                    rsrv: {
-                        'secret': c.return_value('authentication radius server ' + rsrv + ' key'),
-                        'fail-time': ftime,
-                        'req-limit': reql
-                    }
-                }
-            )
-        # Source ip address feature
-        if c.exists('authentication radius source-address'):
-            config_data['authentication']['radius_source_address'] = c.return_value(
-                'authentication radius source-address')
-
-        # advanced radius-setting
-        if c.exists('authentication radius acct-timeout'):
-            config_data['authentication']['radiusopt']['acct-timeout'] = c.return_value(
-                'authentication radius acct-timeout')
-        if c.exists('authentication radius max-try'):
-            config_data['authentication']['radiusopt']['max-try'] = c.return_value(
-                'authentication radius max-try')
-        if c.exists('authentication radius timeout'):
-            config_data['authentication']['radiusopt']['timeout'] = c.return_value(
-                'authentication radius timeout')
-        if c.exists('authentication radius nas-identifier'):
-            config_data['authentication']['radiusopt']['nas-id'] = c.return_value(
-                'authentication radius nas-identifier')
-        if c.exists('authentication radius dae-server'):
-            # Set default dae-server port if not defined
-            if c.exists('authentication radius dae-server port'):
-                dae_server_port = c.return_value(
-                    'authentication radius dae-server port')
-            else:
-                dae_server_port = "3799"
-            config_data['authentication']['radiusopt'].update(
-                {
-                    'dae-srv': {
-                        'ip-addr': c.return_value('authentication radius dae-server ip-address'),
-                        'port': dae_server_port,
-                        'secret': str(c.return_value('authentication radius dae-server secret'))
-                    }
-                }
-            )
-        # filter-id is the internal accel default if attribute is empty
-        # set here as default for visibility which may change in the future
-        if c.exists('authentication radius rate-limit enable'):
-            if not c.exists('authentication radius rate-limit attribute'):
-                config_data['authentication']['radiusopt']['shaper'] = {
-                    'attr': 'Filter-Id'
-                }
-            else:
-                config_data['authentication']['radiusopt']['shaper'] = {
-                    'attr': c.return_value('authentication radius rate-limit attribute')
-                }
-            if c.exists('authentication radius rate-limit vendor'):
-                config_data['authentication']['radiusopt']['shaper']['vendor'] = c.return_value(
-                    'authentication radius rate-limit vendor')
-
-    if c.exists('client-ip-pool'):
-        if c.exists('client-ip-pool start') and c.exists('client-ip-pool stop'):
-            config_data['client_ip_pool'] = c.return_value(
-                'client-ip-pool start') + '-' + re.search('[0-9]+$', c.return_value('client-ip-pool stop')).group(0)
-
-    if c.exists('client-ip-pool subnet'):
-        config_data['client_ip_subnets'] = c.return_values(
-            'client-ip-pool subnet')
-
-    if c.exists('client-ipv6-pool prefix'):
-        config_data['client_ipv6_pool']['prefix'] = c.return_values(
-            'client-ipv6-pool prefix')
-        config_data['ip6_column'] = 'ip6,'
-    if c.exists('client-ipv6-pool delegate-prefix'):
-        config_data['client_ipv6_pool']['delegate_prefix'] = c.return_values(
-            'client-ipv6-pool delegate-prefix')
-        config_data['ip6_dp_column'] = 'ip6-dp,'
-
-    if c.exists('mtu'):
-        config_data['mtu'] = c.return_value('mtu')
-
-    # gateway address
-    if c.exists('gateway-address'):
-        config_data['gateway_address'] = c.return_value('gateway-address')
-    else:
-        # calculate gw-ip-address
-        if c.exists('client-ip-pool start'):
-            # use start ip as gw-ip-address
-            config_data['gateway_address'] = c.return_value(
-                'client-ip-pool start')
-        elif c.exists('client-ip-pool subnet'):
-            # use first ip address from first defined pool
-            lst_ip = re.findall("\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}", c.return_values(
-                'client-ip-pool subnet')[0])
-            config_data['gateway_address'] = lst_ip[0]
-
-    if c.exists('authentication require'):
-        auth_mods = {'pap': 'pap', 'chap': 'auth_chap_md5',
-                     'mschap': 'auth_mschap_v1', 'mschap-v2': 'auth_mschap_v2'}
-        for proto in c.return_values('authentication require'):
-            config_data['authentication']['auth_proto'].append(
-                auth_mods[proto])
-    else:
-        config_data['authentication']['auth_proto'] = ['auth_mschap_v2']
-
-    if c.exists('authentication mppe'):
-        config_data['authentication']['mppe'] = c.return_value(
-            'authentication mppe')
-
-    if c.exists('idle'):
-        config_data['idle_timeout'] = c.return_value('idle')
-
-    # LNS secret
-    if c.exists('lns shared-secret'):
-        config_data['lns_shared_secret'] = c.return_value('lns shared-secret')
-
-    if c.exists('ccp-disable'):
-        config_data['ccp_disable'] = True
-
-    # ppp_options
-    ppp_options = {}
-    if c.exists('ppp-options'):
-        if c.exists('ppp-options lcp-echo-failure'):
-            ppp_options['lcp-echo-failure'] = c.return_value(
-                'ppp-options lcp-echo-failure')
-        if c.exists('ppp-options lcp-echo-interval'):
-            ppp_options['lcp-echo-interval'] = c.return_value(
-                'ppp-options lcp-echo-interval')
-
-    if len(ppp_options) != 0:
-        config_data['ppp_options'] = ppp_options
-
-    return config_data
-
-
-def verify(c):
-    if c == None:
-        return None
-
-    if c['authentication']['mode'] == 'local':
-        if not c['authentication']['local-users']:
-            raise ConfigError(
-                'l2tp-server authentication local-users required')
-        for usr in c['authentication']['local-users']:
-            if not c['authentication']['local-users'][usr]['passwd']:
-                raise ConfigError('user ' + usr + ' requires a password')
-
-    if c['authentication']['mode'] == 'radius':
-        if len(c['authentication']['radiussrv']) == 0:
-            raise ConfigError('radius server required')
-        for rsrv in c['authentication']['radiussrv']:
-            if c['authentication']['radiussrv'][rsrv]['secret'] == None:
-                raise ConfigError('radius server ' + rsrv +
-                                  ' needs a secret configured')
-
-    # check for the existence of a client ip pool
-    if not c['client_ip_pool'] and not c['client_ip_subnets']:
-        raise ConfigError(
-            "set vpn l2tp remote-access client-ip-pool requires subnet or start/stop IP pool")
-
-    # check ipv6
-    if 'delegate_prefix' in c['client_ipv6_pool'] and not 'prefix' in c['client_ipv6_pool']:
-        raise ConfigError(
-            "\"set vpn l2tp remote-access client-ipv6-pool prefix\" required for delegate-prefix ")
-
-    if len(c['dnsv6']) > 3:
-        raise ConfigError("Maximum allowed dnsv6-servers addresses is 3")
-
-
-def generate(c):
-    if c == None:
-        return None
-
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'l2tp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader, trim_blocks=True)
-
-    # accel-cmd reload doesn't work so any change results in a restart of the daemon
-    try:
-        if os.cpu_count() == 1:
-            c['thread_cnt'] = 1
-        else:
-            c['thread_cnt'] = int(os.cpu_count()/2)
-    except KeyError:
-        if os.cpu_count() == 1:
-            c['thread_cnt'] = 1
-        else:
-            c['thread_cnt'] = int(os.cpu_count()/2)
-
-    tmpl = env.get_template('l2tp.config.tmpl')
-    config_text = tmpl.render(c)
-    open(l2tp_conf, 'w').write(config_text)
-
-    if c['authentication']['local-users']:
-        tmpl = env.get_template('chap-secrets.tmpl')
-        chap_secrets_txt = tmpl.render(c)
-        old_umask = os.umask(0o077)
-        open(chap_secrets, 'w').write(chap_secrets_txt)
-        os.umask(old_umask)
-
-    return c
-
-
-def apply(c):
-    if c == None:
-        if os.path.exists(pidfile):
-            _accel_cmd('shutdown hard')
-            if os.path.exists(pidfile):
-                os.remove(pidfile)
-        return None
-
-    if not os.path.exists(pidfile):
-        ret = run(f'/usr/sbin/accel-pppd -c {l2tp_conf} -p {pidfile} -d')
-        chk_con()
-        if ret != 0 and os.path.exists(pidfile):
-            os.remove(pidfile)
-            raise ConfigError('accel-pppd failed to start')
-    else:
-        # if gw ip changes, only restart doesn't work
-        _accel_cmd('restart')
-
-
-if __name__ == '__main__':
-    try:
-        c = get_config()
-        verify(c)
-        generate(c)
-        apply(c)
-    except ConfigError as e:
-        print(e)
-        sys.exit(1)
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
new file mode 100755
index 000000000..7ecd8b2a4
--- /dev/null
+++ b/src/conf_mode/vpn_l2tp.py
@@ -0,0 +1,398 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import re
+
+from copy import deepcopy
+from stat import S_IRUSR, S_IWUSR, S_IRGRP
+from sys import exit
+from time import sleep
+
+from ipaddress import ip_network
+from jinja2 import FileSystemLoader, Environment
+
+from vyos.config import Config
+from vyos.defaults import directories as vyos_data_dir
+from vyos.util import call
+from vyos.validate import is_ipv4
+from vyos import ConfigError
+
+l2tp_conf = '/etc/accel-ppp/l2tp.conf'
+l2tp_chap_secrets = '/etc/accel-ppp/l2tp.chap-secrets'
+
+default_config_data = {
+    'auth_mode': 'local',
+    'auth_ppp_mppe': 'prefer',
+    'auth_proto': ['auth_mschap_v2'],
+    'chap_secrets_file': l2tp_chap_secrets, # used in Jinja2 template
+    'client_ip_pool': None,
+    'client_ip_subnets': [],
+    'client_ipv6_pool': [],
+    'client_ipv6_delegate_prefix': [],
+    'dnsv4': [],
+    'dnsv6': [],
+    'gateway_address': '10.255.255.0',
+    'local_users' : [],
+    'mtu': '1436',
+    'outside_addr': '',
+    'ppp_mppe': 'prefer',
+    'ppp_echo_failure' : '3',
+    'ppp_echo_interval' : '30',
+    'ppp_echo_timeout': '0',
+    'radius_server': [],
+    'radius_acct_tmo': '3',
+    'radius_max_try': '3',
+    'radius_timeout': '3',
+    'radius_nas_id': '',
+    'radius_nas_ip': '',
+    'radius_source_address': '',
+    'radius_shaper_attr': '',
+    'radius_shaper_vendor': '',
+    'radius_dynamic_author': '',
+    'wins': [],
+    'ip6_column': [],
+    'thread_cnt': 1
+}
+
+def get_config():
+    conf = Config()
+    base_path = ['vpn', 'l2tp', 'remote-access']
+    if not conf.exists(base_path):
+        return None
+
+    conf.set_level(base_path)
+    l2tp = deepcopy(default_config_data)
+
+    cpu = os.cpu_count()
+    if cpu > 1:
+        l2tp['thread_cnt'] = int(cpu/2)
+
+    ### general options ###
+    if conf.exists(['name-server']):
+        for name_server in conf.return_values(['name-server']):
+            if is_ipv4(name_server):
+                l2tp['dnsv4'].append(name_server)
+            else:
+                l2tp['dnsv6'].append(name_server)
+
+    if conf.exists(['wins-server']):
+        l2tp['wins'] = conf.return_values(['wins-server'])
+
+    if conf.exists('outside-address'):
+        l2tp['outside_addr'] = conf.return_value('outside-address')
+
+    if conf.exists(['authentication', 'mode']):
+        l2tp['auth_mode'] = conf.return_value(['authentication', 'mode'])
+
+    if conf.exists(['authentication', 'protocols']):
+        auth_mods = {
+            'pap': 'auth_pap',
+            'chap': 'auth_chap_md5',
+            'mschap': 'auth_mschap_v1',
+            'mschap-v2': 'auth_mschap_v2'
+        }
+
+        for proto in conf.return_values(['authentication', 'protocols']):
+            l2tp['auth_proto'].append(auth_mods[proto])
+
+    if conf.exists(['authentication', 'mppe']):
+        l2tp['auth_ppp_mppe'] = conf.return_value(['authentication', 'mppe'])
+
+    #
+    # local auth
+    if conf.exists(['authentication', 'local-users']):
+        for username in conf.list_nodes(['authentication', 'local-users', 'username']):
+            user = {
+                'name' : username,
+                'password' : '',
+                'state' : 'enabled',
+                'ip' : '*',
+                'upload' : None,
+                'download' : None
+            }
+
+            conf.set_level(base_path + ['authentication', 'local-users', 'username', username])
+
+            if conf.exists(['password']):
+                user['password'] = conf.return_value(['password'])
+
+            if conf.exists(['disable']):
+                user['state'] = 'disable'
+
+            if conf.exists(['static-ip']):
+                user['ip'] = conf.return_value(['static-ip'])
+
+            if conf.exists(['rate-limit', 'download']):
+                user['download'] = conf.return_value(['rate-limit', 'download'])
+
+            if conf.exists(['rate-limit', 'upload']):
+                user['upload'] = conf.return_value(['rate-limit', 'upload'])
+
+            l2tp['local_users'].append(user)
+
+    #
+    # RADIUS auth and settings
+    conf.set_level(base_path + ['authentication', 'radius'])
+    if conf.exists(['server']):
+        for server in conf.list_nodes(['server']):
+            radius = {
+                'server' : server,
+                'key' : '',
+                'fail_time' : 0,
+                'port' : '1812'
+            }
+
+            conf.set_level(base_path + ['authentication', 'radius', 'server', server])
+
+            if conf.exists(['fail-time']):
+                radius['fail-time'] = conf.return_value(['fail-time'])
+
+            if conf.exists(['port']):
+                radius['port'] = conf.return_value(['port'])
+
+            if conf.exists(['key']):
+                radius['key'] = conf.return_value(['key'])
+
+            if not conf.exists(['disable']):
+                l2tp['radius_server'].append(radius)
+
+        #
+        # advanced radius-setting
+        conf.set_level(base_path + ['authentication', 'radius'])
+
+        if conf.exists(['acct-timeout']):
+            l2tp['radius_acct_tmo'] = conf.return_value(['acct-timeout'])
+
+        if conf.exists(['max-try']):
+            l2tp['radius_max_try'] = conf.return_value(['max-try'])
+
+        if conf.exists(['timeout']):
+            l2tp['radius_timeout'] = conf.return_value(['timeout'])
+
+        if conf.exists(['nas-identifier']):
+            l2tp['radius_nas_id'] = conf.return_value(['nas-identifier'])
+
+        if conf.exists(['nas-ip-address']):
+            l2tp['radius_nas_ip'] = conf.return_value(['nas-ip-address'])
+
+        if conf.exists(['source-address']):
+            l2tp['radius_source_address'] = conf.return_value(['source-address'])
+
+        # Dynamic Authorization Extensions (DOA)/Change Of Authentication (COA)
+        if conf.exists(['dynamic-author']):
+            dae = {
+                'port' : '',
+                'server' : '',
+                'key' : ''
+            }
+
+            if conf.exists(['dynamic-author', 'server']):
+                dae['server'] = conf.return_value(['dynamic-author', 'server'])
+
+            if conf.exists(['dynamic-author', 'port']):
+                dae['port'] = conf.return_value(['dynamic-author', 'port'])
+
+            if conf.exists(['dynamic-author', 'key']):
+                dae['key'] = conf.return_value(['dynamic-author', 'key'])
+
+            l2tp['radius_dynamic_author'] = dae
+
+        if conf.exists(['rate-limit', 'enable']):
+            l2tp['radius_shaper_attr'] = 'Filter-Id'
+            c_attr = ['rate-limit', 'enable', 'attribute']
+            if conf.exists(c_attr):
+                l2tp['radius_shaper_attr'] = conf.return_value(c_attr)
+
+            c_vendor = ['rate-limit', 'enable', 'vendor']
+            if conf.exists(c_vendor):
+                l2tp['radius_shaper_vendor'] = conf.return_value(c_vendor)
+
+    conf.set_level(base_path)
+    if conf.exists(['client-ip-pool']):
+        if conf.exists(['client-ip-pool', 'start']) and conf.exists(['client-ip-pool', 'stop']):
+            start = conf.return_value(['client-ip-pool', 'start'])
+            stop  = conf.return_value(['client-ip-pool', 'stop'])
+            l2tp['client_ip_pool'] = start + '-' + re.search('[0-9]+$', stop).group(0)
+
+    if conf.exists(['client-ip-pool', 'subnet']):
+        l2tp['client_ip_subnets'] = conf.return_values(['client-ip-pool', 'subnet'])
+
+    if conf.exists(['client-ipv6-pool', 'prefix']):
+        l2tp['ip6_column'].append('ip6')
+        for prefix in conf.list_nodes(['client-ipv6-pool', 'prefix']):
+            tmp = {
+                'prefix': prefix,
+                'mask': '64'
+            }
+
+            if conf.exists(['client-ipv6-pool', 'prefix', prefix, 'mask']):
+                tmp['mask'] = conf.return_value(['client-ipv6-pool', 'prefix', prefix, 'mask'])
+
+            l2tp['client_ipv6_pool'].append(tmp)
+
+    if conf.exists(['client-ipv6-pool', 'delegate']):
+        l2tp['ip6_column'].append('ip6-db')
+        for prefix in conf.list_nodes(['client-ipv6-pool', 'delegate']):
+            tmp = {
+                'prefix': prefix,
+                'mask': ''
+            }
+
+            if conf.exists(['client-ipv6-pool', 'delegate', prefix, 'mask']):
+                tmp['mask'] = conf.return_value(['client-ipv6-pool', 'delegate', prefix, 'delegation-prefix'])
+
+            l2tp['client_ipv6_delegate_prefix'].append(tmp)
+
+    if conf.exists(['mtu']):
+        l2tp['mtu'] = conf.return_value(['mtu'])
+
+    # gateway address
+    if conf.exists(['gateway-address']):
+        l2tp['gateway_address'] = conf.return_value(['gateway-address'])
+    else:
+        # calculate gw-ip-address
+        if conf.exists(['client-ip-pool', 'start']):
+            # use start ip as gw-ip-address
+            l2tp['gateway_address'] = conf.return_value(['client-ip-pool', 'start'])
+
+        elif conf.exists(['client-ip-pool', 'subnet']):
+            # use first ip address from first defined pool
+            subnet = conf.return_values(['client-ip-pool', 'subnet'])[0]
+            subnet = ip_network(subnet)
+            l2tp['gateway_address'] = str(list(subnet.hosts())[0])
+
+    # LNS secret
+    if conf.exists(['lns', 'shared-secret']):
+        l2tp['lns_shared_secret'] = conf.return_value(['lns', 'shared-secret'])
+
+    if conf.exists(['ccp-disable']):
+        l2tp[['ccp_disable']] = True
+
+    # PPP options
+    if conf.exists(['idle']):
+        l2tp['ppp_echo_timeout'] = conf.return_value(['idle'])
+
+    if conf.exists(['ppp-options', 'lcp-echo-failure']):
+        l2tp['ppp_echo_failure'] = conf.return_value(['ppp-options', 'lcp-echo-failure'])
+
+    if conf.exists(['ppp-options', 'lcp-echo-interval']):
+        l2tp['ppp_echo_interval'] = conf.return_value(['ppp-options', 'lcp-echo-interval'])
+
+    return l2tp
+
+
+def verify(l2tp):
+    if not l2tp:
+        return None
+
+    if l2tp['auth_mode'] == 'local':
+        if not l2tp['local_users']:
+            raise ConfigError('L2TP local auth mode requires local users to be configured!')
+
+        for user in l2tp['local_users']:
+            if not user['password']:
+                raise ConfigError(f"Password required for user {user['name']}")
+
+    elif l2tp['auth_mode'] == 'radius':
+        if len(l2tp['radius_server']) == 0:
+            raise ConfigError("RADIUS authentication requires at least one server")
+
+        for radius in l2tp['radius_server']:
+            if not radius['key']:
+                raise ConfigError(f"Missing RADIUS secret for server {{ radius['key'] }}")
+
+    # check for the existence of a client ip pool
+    if not (l2tp['client_ip_pool'] or l2tp['client_ip_subnets']):
+        raise ConfigError(
+            "set vpn l2tp remote-access client-ip-pool requires subnet or start/stop IP pool")
+
+    # check ipv6
+    if l2tp['client_ipv6_delegate_prefix'] and not l2tp['client_ipv6_pool']:
+        raise ConfigError('IPv6 prefix delegation requires client-ipv6-pool prefix')
+
+    for prefix in l2tp['client_ipv6_delegate_prefix']:
+        if not prefix['mask']:
+            raise ConfigError('Delegation-prefix required for individual delegated networks')
+
+    if len(l2tp['wins']) > 2:
+        raise ConfigError('Not more then two IPv4 WINS name-servers can be configured')
+
+    if len(l2tp['dnsv4']) > 2:
+        raise ConfigError('Not more then two IPv4 DNS name-servers can be configured')
+
+    if len(l2tp['dnsv6']) > 3:
+        raise ConfigError('Not more then three IPv6 DNS name-servers can be configured')
+
+    return None
+
+
+def generate(l2tp):
+    if not l2tp:
+        return None
+
+    # Prepare Jinja2 template loader from files
+    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'l2tp')
+    fs_loader = FileSystemLoader(tmpl_path)
+    env = Environment(loader=fs_loader, trim_blocks=True)
+
+    dirname = os.path.dirname(l2tp_conf)
+    if not os.path.exists(dirname):
+        os.mkdir(dirname)
+
+    tmpl = env.get_template('l2tp.config.tmpl')
+    config_text = tmpl.render(c)
+    with open(l2tp_conf, 'w') as f:
+        f.write(config_text)
+
+    if l2tp['auth_mode'] == 'local':
+        tmpl = env.get_template('chap-secrets.tmpl')
+        config_text = tmpl.render(l2tp)
+        with open(l2tp_chap_secrets, 'w') as f:
+            f.write(config_text)
+
+        os.chmod(l2tp_chap_secrets, S_IRUSR | S_IWUSR | S_IRGRP)
+
+    else:
+        if os.path.exists(l2tp_chap_secrets):
+             os.unlink(l2tp_chap_secrets)
+
+    return None
+
+
+def apply(l2tp):
+    if not l2tp:
+        call('systemctl stop accel-ppp-l2tp.service')
+
+        if os.path.exists(l2tp_conf):
+             os.unlink(l2tp_conf)
+
+        if os.path.exists(l2tp_chap_secrets):
+             os.unlink(l2tp_chap_secrets)
+
+        return None
+
+    call('systemctl restart accel-ppp-l2tp.service')
+
+if __name__ == '__main__':
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        exit(1)
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index ca0844c50..b2eb5bdcb 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -18,7 +18,6 @@ import os
 
 from time import sleep
 from sys import exit
-from socket import socket, AF_INET, SOCK_STREAM
 from copy import deepcopy
 from stat import S_IRUSR, S_IWUSR, S_IRGRP
 from jinja2 import FileSystemLoader, Environment
@@ -26,41 +25,17 @@ from jinja2 import FileSystemLoader, Environment
 from vyos.config import Config
 from vyos import ConfigError
 from vyos.defaults import directories as vyos_data_dir
-from vyos.util import process_running
-from vyos.util import process_running, cmd, run
-
-pidfile = r'/var/run/accel_sstp.pid'
-sstp_cnf_dir = r'/etc/accel-ppp/sstp'
-chap_secrets = sstp_cnf_dir + '/chap-secrets'
-sstp_conf = sstp_cnf_dir + '/sstp.config'
-
-# config path creation
-if not os.path.exists(sstp_cnf_dir):
-    os.makedirs(sstp_cnf_dir)
-
-def chk_con():
-    cnt = 0
-    s = socket(AF_INET, SOCK_STREAM)
-    while True:
-        try:
-            s.connect(("127.0.0.1", 2005))
-            s.close()
-            break
-        except ConnectionRefusedError:
-            sleep(0.5)
-            cnt += 1
-            if cnt == 100:
-                raise("failed to start sstp server")
-                break
-
-
-def _accel_cmd(command):
-    return run(f'/usr/bin/accel-cmd -p 2005 {command}')
+from vyos.util import call, run
+
+sstp_conf = '/etc/accel-ppp/sstp.conf'
+sstp_chap_secrets = '/etc/accel-ppp/sstp.chap-secrets'
 
 default_config_data = {
     'local_users' : [],
     'auth_mode' : 'local',
-    'auth_proto' : [],
+    'auth_proto' : ['auth_mschap_v2'],
+    'chap_secrets_file': sstp_chap_secrets, # used in Jinja2 template
+    'client_gateway': '',
     'radius_server' : [],
     'radius_acct_tmo' : '3',
     'radius_max_try' : '3',
@@ -77,11 +52,11 @@ default_config_data = {
     'client_ip_pool' : [],
     'dnsv4' : [],
     'mtu' : '',
-    'ppp_mppe' : '',
+    'ppp_mppe' : 'prefer',
     'ppp_echo_failure' : '',
     'ppp_echo_interval' : '',
     'ppp_echo_timeout' : '',
-    'thread_cnt' : ''
+    'thread_cnt' : 1
 }
 
 def get_config():
@@ -93,10 +68,9 @@ def get_config():
 
     conf.set_level(base_path)
 
-    cpu = int(os.cpu_count()/2)
-    if cpu < 1:
-        cpu = 1
-    sstp['thread_cnt'] = cpu
+    cpu = os.cpu_count()
+    if cpu > 1:
+        sstp['thread_cnt'] = int(cpu/2)
 
     if conf.exists(['authentication', 'mode']):
         sstp['auth_mode'] = conf.return_value(['authentication', 'mode'])
@@ -224,9 +198,6 @@ def get_config():
         for proto in conf.return_values(['protocols']):
             sstp['auth_proto'].append(auth_mods[proto])
 
-    else:
-        sstp['auth_proto'] = ['auth_mschap_v2']
-
     #
     # read in SSL certs
     conf.set_level(base_path + ['ssl'])
@@ -262,7 +233,7 @@ def get_config():
     # read in PPP stuff
     conf.set_level(base_path + ['ppp-settings'])
     if conf.exists('mppe'):
-        sstp['ppp_mppe'] = conf.return_value('ppp-settings mppe')
+        sstp['ppp_mppe'] = conf.return_value(['ppp-settings', 'mppe'])
 
     if conf.exists(['lcp-echo-failure']):
         sstp['ppp_echo_failure'] = conf.return_value(['lcp-echo-failure'])
@@ -283,7 +254,7 @@ def verify(sstp):
     # vertify auth settings
     if sstp['auth_mode'] == 'local':
         if not sstp['local_users']:
-            raise ConfigError('sstp-server authentication local-users required')
+            raise ConfigError('SSTP local auth mode requires local users to be configured!')
 
         for user in sstp['local_users']:
             if not user['password']:
@@ -303,7 +274,7 @@ def verify(sstp):
             raise ConfigError("Client gateway IP address required")
 
     if len(sstp['dnsv4']) > 2:
-        raise ConfigError("Only 2 DNS name-servers can be configured")
+        raise ConfigError('Not more then two IPv4 DNS name-servers can be configured')
 
     if not sstp['ssl_ca'] or not sstp['ssl_cert'] or not sstp['ssl_key']:
         raise ConfigError('One or more SSL certificates missing')
@@ -334,6 +305,10 @@ def generate(sstp):
     fs_loader = FileSystemLoader(tmpl_path)
     env = Environment(loader=fs_loader, trim_blocks=True)
 
+    dirname = os.path.dirname(sstp_conf)
+    if not os.path.exists(dirname):
+        os.mkdir(dirname)
+
     # accel-cmd reload doesn't work so any change results in a restart of the daemon
     tmpl = env.get_template('sstp.config.tmpl')
     config_text = tmpl.render(sstp)
@@ -343,52 +318,29 @@ def generate(sstp):
     if sstp['local_users']:
         tmpl = env.get_template('chap-secrets.tmpl')
         config_text = tmpl.render(sstp)
-        with open(chap_secrets, 'w') as f:
-            f.write(config_text)
+        with open(sstp_chap_secrets, 'w') as f:
+            f.write(sstp_chap_secrets)
 
-        os.chmod(chap_secrets, S_IRUSR | S_IWUSR | S_IRGRP)
+        os.chmod(sstp_chap_secrets, S_IRUSR | S_IWUSR | S_IRGRP)
     else:
-        if os.path.exists(chap_secrets):
-             os.unlink(chap_secrets)
+        if os.path.exists(sstp_chap_secrets):
+             os.unlink(sstp_chap_secrets)
 
     return sstp
 
 def apply(sstp):
-    if sstp is None:
-        if process_running(pidfile):
-            command = 'start-stop-daemon'
-            command += ' --stop '
-            command += ' --quiet'
-            command += ' --oknodo'
-            command += ' --pidfile ' + pidfile
-            cmd(command)
+    if not sstp:
+        call('systemctl stop accel-ppp-sstp.service')
 
-        if os.path.exists(pidfile):
-            os.remove(pidfile)
+        if os.path.exists(sstp_conf):
+             os.unlink(sstp_conf)
 
-        return None
+        if os.path.exists(sstp_chap_secrets):
+             os.unlink(sstp_chap_secrets)
 
-    if not process_running(pidfile):
-        if os.path.exists(pidfile):
-            os.remove(pidfile)
-
-        command = 'start-stop-daemon'
-        command += ' --start '
-        command += ' --quiet'
-        command += ' --oknodo'
-        command += ' --pidfile ' + pidfile
-        command += ' --exec /usr/sbin/accel-pppd'
-        # now pass arguments to accel-pppd binary
-        command += ' --'
-        command += ' -c ' + sstp_conf
-        command += ' -p ' + pidfile
-        command += ' -d'
-        cmd(command)
-
-        chk_con()
+        return None
 
-    else:
-        _accel_cmd('restart')
+    call('systemctl restart accel-ppp-sstp.service')
 
 
 if __name__ == '__main__':
diff --git a/src/etc/systemd/system/accel-ppp-l2tp.service b/src/etc/systemd/system/accel-ppp-l2tp.service
new file mode 100644
index 000000000..27f0cc8c0
--- /dev/null
+++ b/src/etc/systemd/system/accel-ppp-l2tp.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Accel-PPP/L2TP
+After=vyos-router.service
+
+[Service]
+ExecStart=/usr/sbin/accel-pppd -d -p /run/accel-pppd-l2tp.pid -c /etc/accel-ppp/l2tp.conf
+ExecReload=/bin/kill -SIGUSR1 $MAINPID
+PIDFile=/run/accel-pppd-l2tp.pid
+Type=forking
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Alias=accel-ppp-l2tp.service
diff --git a/src/etc/systemd/system/accel-ppp-sstp.service b/src/etc/systemd/system/accel-ppp-sstp.service
new file mode 100644
index 000000000..03bd7f99c
--- /dev/null
+++ b/src/etc/systemd/system/accel-ppp-sstp.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Accel-PPP/SSTP
+After=vyos-router.service
+
+[Service]
+ExecStart=/usr/sbin/accel-pppd -d -p /run/accel-pppd-sstp.pid -c /etc/accel-ppp/sstp.conf
+ExecReload=/bin/kill -SIGUSR1 $MAINPID
+PIDFile=/run/accel-pppd-sstp.pid
+Type=forking
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Alias=accel-ppp-sstp.service
diff --git a/src/migration-scripts/l2tp/2-to-3 b/src/migration-scripts/l2tp/2-to-3
new file mode 100755
index 000000000..bd0839e03
--- /dev/null
+++ b/src/migration-scripts/l2tp/2-to-3
@@ -0,0 +1,111 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# - remove primary/secondary identifier from nameserver
+# - TODO: remove radius server req-limit
+
+import os
+import sys
+
+from sys import argv, exit
+from vyos.configtree import ConfigTree
+
+if (len(argv) < 1):
+    print("Must specify file name!")
+    exit(1)
+
+file_name = argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+config = ConfigTree(config_file)
+base = ['vpn', 'l2tp', 'remote-access']
+if not config.exists(base):
+    # Nothing to do
+    exit(0)
+else:
+
+    # Migrate IPv4 DNS servers
+    dns_base = base + ['dns-servers']
+    if config.exists(dns_base):
+        for server in ['server-1', 'server-2']:
+          if config.exists(dns_base + [server]):
+            dns = config.return_value(dns_base + [server])
+            config.set(base + ['name-server'], value=dns, replace=False)
+
+        config.delete(dns_base)
+
+    # Migrate IPv6 DNS servers
+    dns_base = base + ['dnsv6-servers']
+    if config.exists(dns_base):
+        for server in config.return_values(dns_base):
+            config.set(base + ['name-server'], value=server, replace=False)
+
+        config.delete(dns_base)
+
+    # Migrate IPv4 WINS servers
+    wins_base = base + ['wins-servers']
+    if config.exists(wins_base):
+        for server in ['server-1', 'server-2']:
+          if config.exists(wins_base + [server]):
+            wins = config.return_value(wins_base + [server])
+            config.set(base + ['wins-server'], value=wins, replace=False)
+
+        config.delete(wins_base)
+
+
+    # Remove RADIUS server req-limit node
+    radius_base = base + ['authentication', 'radius']
+    if config.exists(radius_base):
+        for server in config.list_nodes(radius_base + ['server']):
+            if config.exists(radius_base + ['server', server, 'req-limit']):
+                config.delete(radius_base + ['server', server, 'req-limit'])
+
+    # Migrate IPv6 prefixes
+    ipv6_base = base + ['client-ipv6-pool']
+    if config.exists(ipv6_base + ['prefix']):
+        prefix_old = config.return_values(ipv6_base + ['prefix'])
+        # delete old prefix CLI nodes
+        config.delete(ipv6_base + ['prefix'])
+        # create ned prefix tag node
+        config.set(ipv6_base + ['prefix'])
+        config.set_tag(ipv6_base + ['prefix'])
+
+        for p in prefix_old:
+            prefix = p.split(',')[0]
+            mask = p.split(',')[1]
+            config.set(ipv6_base + ['prefix', prefix, 'mask'], value=mask)
+
+    if config.exists(ipv6_base + ['delegate-prefix']):
+        prefix_old = config.return_values(ipv6_base + ['delegate-prefix'])
+        # delete old delegate prefix CLI nodes
+        config.delete(ipv6_base + ['delegate-prefix'])
+        # create ned delegation tag node
+        config.set(ipv6_base + ['delegate '])
+        config.set_tag(ipv6_base + ['delegate '])
+
+        for p in prefix_old:
+            prefix = p.split(',')[0]
+            mask = p.split(',')[1]
+            config.set(ipv6_base + ['delegate', prefix, 'mask'], value=mask)
+
+    try:
+        with open(file_name, 'w') as f:
+            f.write(config.to_string())
+    except OSError as e:
+        print("Failed to save the modified config: {}".format(e))
+        exit(1)