Lowercase all option names

webssh/main.py

@@ -36,9 +36,9 @@ def main():
     logging.info('Listening on {}:{}'.format(options.address, options.port))
     if ssl_ctx:
         server_settings.update(ssl_options=ssl_ctx)
-        app.listen(options.sslPort, options.sslAddress, **server_settings)
-        logging.info('Listening on ssl {}:{}'.format(options.sslAddress,
-                                                     options.sslPort))
+        app.listen(options.sslport, options.ssladdress, **server_settings)
+        logging.info('Listening on ssl {}:{}'.format(options.ssladdress,
+                                                     options.sslport))
     loop.start()
 
 

webssh/settings.py

@@ -19,17 +19,17 @@ def print_version(flag):
 
 define('address', default='127.0.0.1', help='Listen address')
 define('port', type=int, default=8888,  help='Listen port')
-define('sslAddress', default='0.0.0.0', help='SSL listen address')
-define('sslPort', type=int, default=4433,  help='SSL listen port')
+define('ssladdress', default='0.0.0.0', help='SSL listen address')
+define('sslport', type=int, default=4433,  help='SSL listen port')
 define('certfile', default='', help='SSL certificate file')
 define('keyfile', default='', help='SSL private key file')
 define('debug', type=bool, default=False, help='Debug mode')
 define('policy', default='warning',
        help='Missing host key policy, reject|autoadd|warning')
-define('hostFile', default='', help='User defined host keys file')
-define('sysHostFile', default='', help='System wide host keys file')
-define('proxies', default='', help='trusted downstream, separated by comma')
-define('wpIntvl', type=int, default=0, help='Websocket ping interval')
+define('hostfile', default='', help='User defined host keys file')
+define('syshostfile', default='', help='System wide host keys file')
+define('tdstream', default='', help='trusted downstream, separated by comma')
+define('wpintvl', type=int, default=0, help='Websocket ping interval')
 define('version', type=bool, help='Show version information',
        callback=print_version)
 
@@ -44,7 +44,7 @@ def get_app_settings(options):
     settings = dict(
         template_path=os.path.join(base_dir, 'webssh', 'templates'),
         static_path=os.path.join(base_dir, 'webssh', 'static'),
-        websocket_ping_interval=options.wpIntvl,
+        websocket_ping_interval=options.wpintvl,
         debug=options.debug,
         xsrf_cookies=True
     )
@@ -61,16 +61,16 @@ def get_server_settings(options):
 
 
 def get_host_keys_settings(options):
-    if not options.hostFile:
+    if not options.hostfile:
         host_keys_filename = os.path.join(base_dir, 'known_hosts')
     else:
-        host_keys_filename = options.hostFile
+        host_keys_filename = options.hostfile
     host_keys = load_host_keys(host_keys_filename)
 
-    if not options.sysHostFile:
+    if not options.syshostfile:
         filename = os.path.expanduser('~/.ssh/known_hosts')
     else:
-        filename = options.sysHostFile
+        filename = options.syshostfile
     system_host_keys = load_host_keys(filename)
 
     settings = dict(
@@ -106,10 +106,10 @@ def get_ssl_context(options):
 
 
 def get_trusted_downstream(options):
-    proxies = set()
-    for ip in options.proxies.split(','):
+    tdstream = set()
+    for ip in options.tdstream.split(','):
         ip = ip.strip()
         if ip:
             to_ip_address(ip)
-            proxies.add(ip)
-    return proxies
+            tdstream.add(ip)
+    return tdstream