summaryrefslogtreecommitdiff
path: root/src/conf_mode/vpn_sstp.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-22 19:02:18 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-22 19:02:18 +0200
commit2703915afb9a6bf266adc8834ab01ef721c03424 (patch)
tree6314ea4f1861bae76ecdc8465e23f96883c30334 /src/conf_mode/vpn_sstp.py
parentd2477601a6c4f5f11773493cacfdc54e5f9a01ae (diff)
parent6f090e918bae878463aa683511ceab4fbbbade54 (diff)
downloadvyos-1x-2703915afb9a6bf266adc8834ab01ef721c03424.tar.gz
vyos-1x-2703915afb9a6bf266adc8834ab01ef721c03424.zip
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()
Diffstat (limited to 'src/conf_mode/vpn_sstp.py')
-rwxr-xr-xsrc/conf_mode/vpn_sstp.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index 9ec352290..e6ce94709 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -23,7 +23,7 @@ from stat import S_IRUSR, S_IWUSR, S_IRGRP
from vyos.config import Config
from vyos import ConfigError
-from vyos.util import call, run
+from vyos.util import call, run, get_half_cpus
from vyos.template import render
@@ -56,7 +56,7 @@ default_config_data = {
'ppp_echo_failure' : '',
'ppp_echo_interval' : '',
'ppp_echo_timeout' : '',
- 'thread_cnt' : 1
+ 'thread_cnt' : get_half_cpus()
}
def get_config():
@@ -68,10 +68,6 @@ def get_config():
conf.set_level(base_path)
- 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'])
@@ -301,7 +297,7 @@ def verify(sstp):
for radius in sstp['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 }"')
def generate(sstp):
if not sstp: