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

* 'pptp-rewrite' of github.com:c-po/vyos-1x:
  accel-ppp: fix wrong reference in verify() on missing attributes
  accel-ppp: T2314: bugfix wrong placement of endif in Jinja2 template
  vpn: pptp: T2351: add support for common radius-additions XML
  vpn: pptp: T2351: migrate to common radius CLI
  vpn: pptp: T2351: migrate to common name-server, wins-server nodes
  accel-ppp: provide common wins-server include definition
  vpn: pptp: T2351: use first IP from client pool as gateway address
  vpn: pptp: T2351: align configuration to other accel implementations
  vpn: pptp: T2351: migrate from SysVinit to systemd
  vyos.util: migrate all cpu_count() occurances to common get_half_cpus()

1 files changed, 2 insertions, 2 deletions

diff --git a/src/conf_mode/service_ipoe-server.py b/src/conf_mode/service_ipoe-server.py
index 23a2091bd..17fa2c3f0 100755
--- a/src/conf_mode/service_ipoe-server.py
+++ b/src/conf_mode/service_ipoe-server.py
@@ -238,7 +238,7 @@ def verify(ipoe):
 
     for interface in ipoe['interfaces']:
         if not interface['range']:
-            raise ConfigError(f'No IPoE client subnet defined on interface "{{ interface }}"')
+            raise ConfigError(f'No IPoE client subnet defined on interface "{ interface }"')
 
     if len(ipoe['dnsv4']) > 2:
         raise ConfigError('Not more then two IPv4 DNS name-servers can be configured')
@@ -253,7 +253,7 @@ def verify(ipoe):
         for radius in ipoe['radius_server']:
             if not radius['key']:
                 server = radius['server']
-                raise ConfigError(f'Missing RADIUS secret key for server "{{ server }}"')
+                raise ConfigError(f'Missing RADIUS secret key for server "{ server }"')
 
     if ipoe['client_ipv6_delegate_prefix'] and not ipoe['client_ipv6_pool']:
         raise ConfigError('IPoE IPv6 deletate-prefix requires IPv6 prefix to be configured!')