sstp: T2008: use pep8 formatting

1 files changed, 310 insertions, 263 deletions

diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py
index e0ebb2ad9..05bf65fde 100755
--- a/src/conf_mode/vpn_sstp.py
+++ b/src/conf_mode/vpn_sstp.py
@@ -32,14 +32,14 @@ chap_secrets = sstp_cnf_dir + '/chap-secrets'
 sstp_conf = sstp_cnf_dir + '/sstp.config'
 ssl_cert_dir = r'/config/user-data/sstp'
 
-### config path creation
+# config path creation
 if not os.path.exists(sstp_cnf_dir):
-  os.makedirs(sstp_cnf_dir)
-  sl.syslog(sl.LOG_NOTICE, sstp_cnf_dir  + " created")
+    os.makedirs(sstp_cnf_dir)
+    sl.syslog(sl.LOG_NOTICE, sstp_cnf_dir + " created")
 
 if not os.path.exists(ssl_cert_dir):
-  os.makedirs(ssl_cert_dir)
-  sl.syslog(sl.LOG_NOTICE, ssl_cert_dir  + " created")
+    os.makedirs(ssl_cert_dir)
+    sl.syslog(sl.LOG_NOTICE, ssl_cert_dir + " created")
 
 sstp_config = '''
 ### generated by vpn_sstp.py ###
@@ -163,7 +163,7 @@ vendor={{authentication['radiusopt']['shaper']['vendor']}}
 tcp=127.0.0.1:2005
 '''
 
-### sstp chap secrets
+# sstp chap secrets
 chap_secrets_conf = '''
 # username  server  password  acceptable local IP addresses   shaper
 {% for user in authentication['local-users'] %}
@@ -184,40 +184,46 @@ chap_secrets_conf = '''
 # 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", 2005))
-      s.close()
-      break
-    except ConnectionRefusedError:
-      time.sleep(0.5)
-      cnt +=1
-      if cnt == 100:
-        raise("failed to start sstp server")
-        break
-
-### chap_secrets file if auth mode local
+    cnt = 0
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    while True:
+        try:
+            s.connect(("127.0.0.1", 2005))
+            s.close()
+            break
+        except ConnectionRefusedError:
+            time.sleep(0.5)
+            cnt += 1
+            if cnt == 100:
+                raise("failed to start sstp server")
+                break
+
+# chap_secrets file if auth mode local
+
+
 def write_chap_secrets(c):
-  tmpl = jinja2.Template(chap_secrets_conf, trim_blocks=True)
-  chap_secrets_txt = tmpl.render(c)
-  old_umask = os.umask(0o077)
-  open(chap_secrets,'w').write(chap_secrets_txt)
-  os.umask(old_umask)
-  sl.syslog(sl.LOG_NOTICE, chap_secrets + ' written')
+    tmpl = jinja2.Template(chap_secrets_conf, trim_blocks=True)
+    chap_secrets_txt = tmpl.render(c)
+    old_umask = os.umask(0o077)
+    open(chap_secrets, 'w').write(chap_secrets_txt)
+    os.umask(old_umask)
+    sl.syslog(sl.LOG_NOTICE, chap_secrets + ' written')
+
 
 def accel_cmd(cmd=''):
-  if not cmd:
-    return None
-  try:
-    ret = subprocess.check_output(['/usr/bin/accel-cmd','-p','2005',cmd]).decode().strip()
-    return ret
-  except:
-    return 1
+    if not cmd:
+        return None
+    try:
+        ret = subprocess.check_output(
+            ['/usr/bin/accel-cmd', '-p', '2005', cmd]).decode().strip()
+        return ret
+    except:
+        return 1
 
-#### check ig local-ip is in client pool subnet
+# check ig local-ip is in client pool subnet
 
 
 ###
@@ -225,243 +231,284 @@ def accel_cmd(cmd=''):
 ###
 
 def get_config():
-  base_path = ['vpn', 'sstp']
-  c = Config()
-  if not c.exists(base_path):
-    return None
-
-  c.set_level(base_path)
-
-  config_data = {
-    'authentication'    : {
-      'local-users'     : {
-      },
-      'mode'            : 'local',
-      'auth_proto'      : [],
-      'radius-srv'      : {},
-      'radiusopt'       : {},
-      'dae-srv'         : {}
-    },
-    'certs'           : {
-      'ca'            : None,
-      'server-key'    : None,
-      'server-cert'   : None
-    },
-    'ip_pool'         : [],
-    'gw'              : None,
-    'dnsv4'           : [],
-    'mtu'             : None,
-    'ppp'             : {},
-  }
-
-  ### local auth
-  if c.exists('authentication mode local'):
-    if c.exists('authentication local-users'):
-      for usr in c.list_nodes('authentication local-users username'):
-        config_data['authentication']['local-users'].update(
-          {
-            usr : {
-              'passwd'    : None,
-              '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')
-
-  if c.exists('authentication protocols'):
-    auth_mods = {'pap' : 'pap','chap' : 'auth_chap_md5', 'mschap' : 'auth_mschap_v1', 'mschap-v2' : 'auth_mschap_v2'}
-    for proto in c.return_values('authentication protocols'):
-      config_data['authentication']['auth_proto'].append(auth_mods[proto])
-  else:
-    config_data['authentication']['auth_proto'] = ['auth_mschap_v2']
-
-  #### RADIUS auth and settings
-  if c.exists('authentication mode radius'):
-    config_data['authentication']['mode'] = c.return_value('authentication mode')
-    if c.exists('authentication radius-server'):
-      for rsrv in c.list_nodes('authentication radius-server'):
-        config_data['authentication']['radius-srv'][rsrv] = {}
-        if c.exists('authentication radius-server ' + rsrv + ' secret'):
-          config_data['authentication']['radius-srv'][rsrv]['secret'] = c.return_value('authentication radius-server ' + rsrv + ' secret')
-        else:
-          config_data['authentication']['radius-srv'][rsrv]['secret'] = None
-        if c.exists('authentication radius-server ' + rsrv + ' fail-time'):
-          config_data['authentication']['radius-srv'][rsrv]['fail-time'] = c.return_value('authentication radius-server ' + rsrv + ' fail-time')
-        else:
-          config_data['authentication']['radius-srv'][rsrv]['fail-time'] = 0
-        if c.exists('authentication radius-server ' + rsrv + ' req-limit'):
-          config_data['authentication']['radius-srv'][rsrv]['req-limit'] = c.return_value('authentication radius-server ' + rsrv + ' req-limit')
-        else:
-          config_data['authentication']['radius-srv'][rsrv]['req-limit'] = 0
-
-    #### advanced radius-setting
-    if c.exists('authentication radius-settings'):
-      if c.exists('authentication radius-settings acct-timeout'):
-        config_data['authentication']['radiusopt']['acct-timeout'] = c.return_value('authentication radius-settings acct-timeout')
-      if c.exists('authentication radius-settings max-try'):
-        config_data['authentication']['radiusopt']['max-try'] = c.return_value('authentication radius-settings max-try')
-      if c.exists('authentication radius-settings timeout'):
-        config_data['authentication']['radiusopt']['timeout'] = c.return_value('authentication radius-settings timeout')
-      if c.exists('authentication radius-settings nas-identifier'):
-        config_data['authentication']['radiusopt']['nas-id'] = c.return_value('authentication radius-settings nas-identifier')
-      if c.exists('authentication radius-settings nas-ip-address'):
-        config_data['authentication']['radiusopt']['nas-ip'] = c.return_value('authentication radius-settings nas-ip-address')
-      if c.exists('authentication radius-settings dae-server'):
-        config_data['authentication']['radiusopt'].update(
-          {
-            'dae-srv' : {
-              'ip-addr' : c.return_value('authentication radius-settings dae-server ip-address'),
-              'port'    : c.return_value('authentication radius-settings dae-server port'),
-              'secret'  : str(c.return_value('authentication radius-settings dae-server secret'))
-            }
-          }
-        )
-      if c.exists('authentication radius-settings rate-limit enable'):
-        if not c.exists('authentication radius-settings rate-limit attribute'):
-          config_data['authentication']['radiusopt']['shaper'] = { 'attr'  : 'Filter-Id' }
-        else:
-          config_data['authentication']['radiusopt']['shaper'] = {
-            'attr'  : c.return_value('authentication radius-settings rate-limit attribute')
-          }
-        if c.exists('authentication radius-settings rate-limit vendor'):
-          config_data['authentication']['radiusopt']['shaper']['vendor'] = c.return_value('authentication radius-settings rate-limit vendor')
-
-  if c.exists('sstp-settings ssl-certs ca'):
-    config_data['certs']['ca'] = c.return_value('sstp-settings ssl-certs ca')
-  if c.exists('sstp-settings ssl-certs server-cert'):
-    config_data['certs']['server-cert'] = c.return_value('sstp-settings ssl-certs server-cert')
-  if c.exists('sstp-settings ssl-certs server-key'):
-    config_data['certs']['server-key'] = c.return_value('sstp-settings ssl-certs server-key')
-
-  if c.exists('network-settings client-ip-settings subnet'):
-    config_data['ip_pool'] = c.return_values('network-settings client-ip-settings subnet')
-  if c.exists('network-settings client-ip-settings gateway-address'):
-    config_data['gw'] = c.return_value('network-settings client-ip-settings gateway-address')
-  if c.exists('network-settings name-server'):
-    config_data['dnsv4'] = c.return_values('network-settings name-server')
-  if c.exists('network-settings mtu'):
-    config_data['mtu'] = c.return_value('network-settings mtu')
-
-  #### ppp
-  if c.exists('ppp-settings mppe'):
-    config_data['ppp']['mppe'] = c.return_value('ppp-settings mppe')
-  if c.exists('ppp-settings lcp-echo-failure'):
-    config_data['ppp']['lcp-echo-failure'] = c.return_value('ppp-settings lcp-echo-failure')
-  if c.exists('ppp-settings lcp-echo-interval'):
-    config_data['ppp']['lcp-echo-interval'] = c.return_value('ppp-settings lcp-echo-interval')
-  if c.exists('ppp-settings lcp-echo-timeout'):
-    config_data['ppp']['lcp-echo-timeout'] = c.return_value('ppp-settings lcp-echo-timeout')
-
-  return config_data
+    base_path = ['vpn', 'sstp']
+    c = Config()
+    if not c.exists(base_path):
+        return None
+
+    c.set_level(base_path)
+
+    config_data = {
+        'authentication': {
+            'local-users': {
+            },
+            'mode': 'local',
+            'auth_proto': [],
+            'radius-srv': {},
+            'radiusopt': {},
+            'dae-srv': {}
+        },
+        'certs': {
+            'ca': None,
+            'server-key': None,
+            'server-cert': None
+        },
+        'ip_pool': [],
+        'gw': None,
+        'dnsv4': [],
+        'mtu': None,
+        'ppp': {},
+    }
+
+    # local auth
+    if c.exists('authentication mode local'):
+        if c.exists('authentication local-users'):
+            for usr in c.list_nodes('authentication local-users username'):
+                config_data['authentication']['local-users'].update(
+                    {
+                        usr: {
+                            'passwd': None,
+                            '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')
+
+    if c.exists('authentication protocols'):
+        auth_mods = {'pap': 'pap', 'chap': 'auth_chap_md5',
+                     'mschap': 'auth_mschap_v1', 'mschap-v2': 'auth_mschap_v2'}
+        for proto in c.return_values('authentication protocols'):
+            config_data['authentication']['auth_proto'].append(
+                auth_mods[proto])
+    else:
+        config_data['authentication']['auth_proto'] = ['auth_mschap_v2']
+
+    # RADIUS auth and settings
+    if c.exists('authentication mode radius'):
+        config_data['authentication']['mode'] = c.return_value(
+            'authentication mode')
+        if c.exists('authentication radius-server'):
+            for rsrv in c.list_nodes('authentication radius-server'):
+                config_data['authentication']['radius-srv'][rsrv] = {}
+                if c.exists('authentication radius-server ' + rsrv + ' secret'):
+                    config_data['authentication']['radius-srv'][rsrv]['secret'] = c.return_value(
+                        'authentication radius-server ' + rsrv + ' secret')
+                else:
+                    config_data['authentication']['radius-srv'][rsrv]['secret'] = None
+                if c.exists('authentication radius-server ' + rsrv + ' fail-time'):
+                    config_data['authentication']['radius-srv'][rsrv]['fail-time'] = c.return_value(
+                        'authentication radius-server ' + rsrv + ' fail-time')
+                else:
+                    config_data['authentication']['radius-srv'][rsrv]['fail-time'] = 0
+                if c.exists('authentication radius-server ' + rsrv + ' req-limit'):
+                    config_data['authentication']['radius-srv'][rsrv]['req-limit'] = c.return_value(
+                        'authentication radius-server ' + rsrv + ' req-limit')
+                else:
+                    config_data['authentication']['radius-srv'][rsrv]['req-limit'] = 0
+
+        # advanced radius-setting
+        if c.exists('authentication radius-settings'):
+            if c.exists('authentication radius-settings acct-timeout'):
+                config_data['authentication']['radiusopt']['acct-timeout'] = c.return_value(
+                    'authentication radius-settings acct-timeout')
+            if c.exists('authentication radius-settings max-try'):
+                config_data['authentication']['radiusopt']['max-try'] = c.return_value(
+                    'authentication radius-settings max-try')
+            if c.exists('authentication radius-settings timeout'):
+                config_data['authentication']['radiusopt']['timeout'] = c.return_value(
+                    'authentication radius-settings timeout')
+            if c.exists('authentication radius-settings nas-identifier'):
+                config_data['authentication']['radiusopt']['nas-id'] = c.return_value(
+                    'authentication radius-settings nas-identifier')
+            if c.exists('authentication radius-settings nas-ip-address'):
+                config_data['authentication']['radiusopt']['nas-ip'] = c.return_value(
+                    'authentication radius-settings nas-ip-address')
+            if c.exists('authentication radius-settings dae-server'):
+                config_data['authentication']['radiusopt'].update(
+                    {
+                        'dae-srv': {
+                            'ip-addr': c.return_value('authentication radius-settings dae-server ip-address'),
+                            'port': c.return_value('authentication radius-settings dae-server port'),
+                            'secret': str(c.return_value('authentication radius-settings dae-server secret'))
+                        }
+                    }
+                )
+            if c.exists('authentication radius-settings rate-limit enable'):
+                if not c.exists('authentication radius-settings rate-limit attribute'):
+                    config_data['authentication']['radiusopt']['shaper'] = {
+                        'attr': 'Filter-Id'}
+                else:
+                    config_data['authentication']['radiusopt']['shaper'] = {
+                        'attr': c.return_value('authentication radius-settings rate-limit attribute')
+                    }
+                if c.exists('authentication radius-settings rate-limit vendor'):
+                    config_data['authentication']['radiusopt']['shaper']['vendor'] = c.return_value(
+                        'authentication radius-settings rate-limit vendor')
+
+    if c.exists('sstp-settings ssl-certs ca'):
+        config_data['certs']['ca'] = c.return_value(
+            'sstp-settings ssl-certs ca')
+    if c.exists('sstp-settings ssl-certs server-cert'):
+        config_data['certs']['server-cert'] = c.return_value(
+            'sstp-settings ssl-certs server-cert')
+    if c.exists('sstp-settings ssl-certs server-key'):
+        config_data['certs']['server-key'] = c.return_value(
+            'sstp-settings ssl-certs server-key')
+
+    if c.exists('network-settings client-ip-settings subnet'):
+        config_data['ip_pool'] = c.return_values(
+            'network-settings client-ip-settings subnet')
+    if c.exists('network-settings client-ip-settings gateway-address'):
+        config_data['gw'] = c.return_value(
+            'network-settings client-ip-settings gateway-address')
+    if c.exists('network-settings name-server'):
+        config_data['dnsv4'] = c.return_values('network-settings name-server')
+    if c.exists('network-settings mtu'):
+        config_data['mtu'] = c.return_value('network-settings mtu')
+
+    # ppp
+    if c.exists('ppp-settings mppe'):
+        config_data['ppp']['mppe'] = c.return_value('ppp-settings mppe')
+    if c.exists('ppp-settings lcp-echo-failure'):
+        config_data['ppp']['lcp-echo-failure'] = c.return_value(
+            'ppp-settings lcp-echo-failure')
+    if c.exists('ppp-settings lcp-echo-interval'):
+        config_data['ppp']['lcp-echo-interval'] = c.return_value(
+            'ppp-settings lcp-echo-interval')
+    if c.exists('ppp-settings lcp-echo-timeout'):
+        config_data['ppp']['lcp-echo-timeout'] = c.return_value(
+            'ppp-settings lcp-echo-timeout')
+
+    return config_data
+
 
 def verify(c):
-  if c == None:
-    return None
-
-  ### vertify auth settings
-  if c['authentication']['mode'] == 'local':
-    if not c['authentication']['local-users']:
-      raise ConfigError('sstp-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 up/download is set, check that both have a value
-      if c['authentication']['local-users'][usr]['upload']:
-        if not c['authentication']['local-users'][usr]['download']:
-          raise ConfigError('user ' + usr + ' requires download speed value')
-      if c['authentication']['local-users'][usr]['download']:
-        if not c['authentication']['local-users'][usr]['upload']:
-          raise ConfigError('user ' + usr + ' requires upload speed value')
-
-  if len(c['dnsv4']) > 2:
-    raise ConfigError("Only 2 DNS name-servers can be configured")
-
-  if not c['certs']['ca'] or not c['certs']['server-key'] or not c['certs']['server-cert']:
-    raise ConfigError('service sstp-server sstp-settings ssl-certs needs the ssl certificates set up')
-  else:
-    ssl_path = ssl_cert_dir + '/'
-    if not os.path.exists(ssl_path + c['certs']['ca']):
-      raise ConfigError('CA {0} doesn\'t exist'.format(ssl_path + c['certs']['ca']))
-    if not os.path.exists(ssl_path + c['certs']['server-cert']):
-      raise ConfigError('SSL Cert {0} doesn\'t exist'.format(ssl_path + c['certs']['server-cert']))
-    if not os.path.exists(ssl_path + c['certs']['server-cert']):
-      raise ConfigError('SSL Key {0} doesn\'t exist'.format(ssl_path + c['certs']['server-key']))
-
-  if c['authentication']['mode'] == 'radius':
-    if len(c['authentication']['radius-srv']) == 0:
-      raise ConfigError('service sstp-server authentication radius-server needs a value')
-    for rsrv in c['authentication']['radius-srv']:
-      if c['authentication']['radius-srv'][rsrv]['secret'] == None:
-        raise ConfigError('service sstp-server authentication radius-server {0} secret requires a value'.format(rsrv))
-
-  if c['authentication']['mode'] == 'local':
-    if not c['ip_pool']:
-      print ("WARNING: service sstp-server network-settings client-ip-settings subnet requires a value")
-    if not c['gw']:
-      print ("WARNING: service sstp-server network-settings client-ip-settings gateway-address requires a value")
+    if c == None:
+        return None
+
+    # vertify auth settings
+    if c['authentication']['mode'] == 'local':
+        if not c['authentication']['local-users']:
+            raise ConfigError(
+                'sstp-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 up/download is set, check that both have a value
+            if c['authentication']['local-users'][usr]['upload']:
+                if not c['authentication']['local-users'][usr]['download']:
+                    raise ConfigError(
+                        'user ' + usr + ' requires download speed value')
+            if c['authentication']['local-users'][usr]['download']:
+                if not c['authentication']['local-users'][usr]['upload']:
+                    raise ConfigError(
+                        'user ' + usr + ' requires upload speed value')
+
+    if len(c['dnsv4']) > 2:
+        raise ConfigError("Only 2 DNS name-servers can be configured")
+
+    if not c['certs']['ca'] or not c['certs']['server-key'] or not c['certs']['server-cert']:
+        raise ConfigError(
+            'service sstp-server sstp-settings ssl-certs needs the ssl certificates set up')
+    else:
+        ssl_path = ssl_cert_dir + '/'
+        if not os.path.exists(ssl_path + c['certs']['ca']):
+            raise ConfigError('CA {0} doesn\'t exist'.format(
+                ssl_path + c['certs']['ca']))
+        if not os.path.exists(ssl_path + c['certs']['server-cert']):
+            raise ConfigError('SSL Cert {0} doesn\'t exist'.format(
+                ssl_path + c['certs']['server-cert']))
+        if not os.path.exists(ssl_path + c['certs']['server-cert']):
+            raise ConfigError('SSL Key {0} doesn\'t exist'.format(
+                ssl_path + c['certs']['server-key']))
+
+    if c['authentication']['mode'] == 'radius':
+        if len(c['authentication']['radius-srv']) == 0:
+            raise ConfigError(
+                'service sstp-server authentication radius-server needs a value')
+        for rsrv in c['authentication']['radius-srv']:
+            if c['authentication']['radius-srv'][rsrv]['secret'] == None:
+                raise ConfigError(
+                    'service sstp-server authentication radius-server {0} secret requires a value'.format(rsrv))
+
+    if c['authentication']['mode'] == 'local':
+        if not c['ip_pool']:
+            print (
+                "WARNING: service sstp-server network-settings client-ip-settings subnet requires a value")
+        if not c['gw']:
+            print (
+                "WARNING: service sstp-server network-settings client-ip-settings gateway-address requires a value")
+
 
 def generate(c):
-  if c == None:
-    return None
+    if c == None:
+        return None
 
-  ### 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)
+    # 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 = jinja2.Template(sstp_config, trim_blocks=True)
+    config_text = tmpl.render(c)
+    open(sstp_conf, 'w').write(config_text)
 
-  tmpl = jinja2.Template(sstp_config, trim_blocks=True)
-  config_text = tmpl.render(c)
-  open(sstp_conf,'w').write(config_text)
+    if c['authentication']['local-users']:
+        write_chap_secrets(c)
 
-  if c['authentication']['local-users']:
-    write_chap_secrets(c)
+    return c
 
-  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 = subprocess.call(['/usr/sbin/accel-pppd','-c',sstp_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:
-    accel_cmd('restart')
-    sl.syslog(sl.LOG_NOTICE, "reloading config via daemon restart")
+    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 = subprocess.call(
+            ['/usr/sbin/accel-pppd', '-c', sstp_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:
+        accel_cmd('restart')
+        sl.syslog(sl.LOG_NOTICE, "reloading config via daemon restart")
+
 
 if __name__ == '__main__':
-  try:
-    c = get_config()
-    verify(c)
-    generate(c)
-    apply(c)
-  except ConfigError as e:
-    print(e)
-    sys.exit(1)
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        sys.exit(1)